Skip to content

Commit 8aa932b

Browse files
committed
Toggle debug mode via env var
remove logging param from global config, allowing logging server and level to be configured inside logging subpackage from CTOP_DEBUG env var
1 parent 35cc8d0 commit 8aa932b

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

Diff for: config/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ func Init() {
1818
GlobalParams = append(GlobalParams, p)
1919
log.Infof("loaded config param: %s: %s", quote(p.Key), quote(p.Val))
2020
}
21-
2221
for _, s := range switches {
2322
GlobalSwitches = append(GlobalSwitches, s)
2423
log.Infof("loaded config switch: %s: %t", quote(s.Key), s.Val)

Diff for: config/switch.go

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ var switches = []*Switch{
1717
Val: true,
1818
Label: "Enable Status Header",
1919
},
20-
&Switch{
21-
Key: "loggingEnabled",
22-
Val: false,
23-
Label: "Enable Logging Server",
24-
},
2520
}
2621

2722
type Switch struct {

Diff for: logging/main.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package logging
22

33
import (
4+
"os"
45
"time"
56

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

37+
if debugMode() {
38+
level = logging.DEBUG
39+
StartServer()
40+
}
41+
3642
backendLvl := logging.AddModuleLevel(Log.backend)
3743
backendLvl.SetLevel(level, "")
3844

@@ -71,3 +77,5 @@ func (log *CTopLogger) Exit() {
7177
exited = true
7278
StopServer()
7379
}
80+
81+
func debugMode() bool { return os.Getenv("CTOP_DEBUG") == "1" }

Diff for: main.go

+6-9
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ var (
2525
func main() {
2626
defer panicExit()
2727

28-
// init global config
29-
config.Init()
30-
3128
// parse command line arguments
3229
var versionFlag = flag.Bool("v", false, "output version information and exit")
3330
var helpFlag = flag.Bool("h", false, "display this help dialog")
@@ -48,6 +45,12 @@ func main() {
4845
os.Exit(0)
4946
}
5047

48+
// init logger
49+
log = logging.Init()
50+
51+
// init global config
52+
config.Init()
53+
5154
// override default config values with command line flags
5255
if *filterFlag != "" {
5356
config.Update("filterStr", *filterFlag)
@@ -66,12 +69,6 @@ func main() {
6669
config.Toggle("sortReversed")
6770
}
6871

69-
// init logger
70-
log = logging.Init()
71-
if config.GetSwitchVal("loggingEnabled") {
72-
logging.StartServer()
73-
}
74-
7572
// init ui
7673
if *invertFlag {
7774
InvertColorMap()

0 commit comments

Comments
 (0)