Skip to content

Commit

Permalink
Toggle debug mode via env var
Browse files Browse the repository at this point in the history
remove logging param from global config, allowing logging server and
level to be configured inside logging subpackage from CTOP_DEBUG env var
  • Loading branch information
bcicen committed Mar 19, 2017
1 parent 35cc8d0 commit 8aa932b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
1 change: 0 additions & 1 deletion config/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ func Init() {
GlobalParams = append(GlobalParams, p)
log.Infof("loaded config param: %s: %s", quote(p.Key), quote(p.Val))
}

for _, s := range switches {
GlobalSwitches = append(GlobalSwitches, s)
log.Infof("loaded config switch: %s: %t", quote(s.Key), s.Val)
Expand Down
5 changes: 0 additions & 5 deletions config/switch.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ var switches = []*Switch{
Val: true,
Label: "Enable Status Header",
},
&Switch{
Key: "loggingEnabled",
Val: false,
Label: "Enable Logging Server",
},
}

type Switch struct {
Expand Down
10 changes: 9 additions & 1 deletion logging/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package logging

import (
"os"
"time"

"github.com/op/go-logging"
Expand All @@ -13,7 +14,7 @@ const (
var (
Log *CTopLogger
exited bool
level = logging.INFO
level = logging.INFO // default level
format = logging.MustStringFormatter(
`%{color}%{time:15:04:05.000} ▶ %{level:.4s} %{id:03x}%{color:reset} %{message}`,
)
Expand All @@ -33,6 +34,11 @@ func Init() *CTopLogger {
logging.NewMemoryBackend(size),
}

if debugMode() {
level = logging.DEBUG
StartServer()
}

backendLvl := logging.AddModuleLevel(Log.backend)
backendLvl.SetLevel(level, "")

Expand Down Expand Up @@ -71,3 +77,5 @@ func (log *CTopLogger) Exit() {
exited = true
StopServer()
}

func debugMode() bool { return os.Getenv("CTOP_DEBUG") == "1" }
15 changes: 6 additions & 9 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ var (
func main() {
defer panicExit()

// init global config
config.Init()

// parse command line arguments
var versionFlag = flag.Bool("v", false, "output version information and exit")
var helpFlag = flag.Bool("h", false, "display this help dialog")
Expand All @@ -48,6 +45,12 @@ func main() {
os.Exit(0)
}

// init logger
log = logging.Init()

// init global config
config.Init()

// override default config values with command line flags
if *filterFlag != "" {
config.Update("filterStr", *filterFlag)
Expand All @@ -66,12 +69,6 @@ func main() {
config.Toggle("sortReversed")
}

// init logger
log = logging.Init()
if config.GetSwitchVal("loggingEnabled") {
logging.StartServer()
}

// init ui
if *invertFlag {
InvertColorMap()
Expand Down

0 comments on commit 8aa932b

Please sign in to comment.