diff --git a/config/main.go b/config/main.go index d5b0d4a..2b4b997 100644 --- a/config/main.go +++ b/config/main.go @@ -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) diff --git a/config/switch.go b/config/switch.go index e16d4d5..0a2f6f8 100644 --- a/config/switch.go +++ b/config/switch.go @@ -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 { diff --git a/logging/main.go b/logging/main.go index cea31b0..68b49b2 100644 --- a/logging/main.go +++ b/logging/main.go @@ -1,6 +1,7 @@ package logging import ( + "os" "time" "github.com/op/go-logging" @@ -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}`, ) @@ -33,6 +34,11 @@ func Init() *CTopLogger { logging.NewMemoryBackend(size), } + if debugMode() { + level = logging.DEBUG + StartServer() + } + backendLvl := logging.AddModuleLevel(Log.backend) backendLvl.SetLevel(level, "") @@ -71,3 +77,5 @@ func (log *CTopLogger) Exit() { exited = true StopServer() } + +func debugMode() bool { return os.Getenv("CTOP_DEBUG") == "1" } diff --git a/main.go b/main.go index 1fc849a..8c28299 100644 --- a/main.go +++ b/main.go @@ -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") @@ -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) @@ -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()