File tree 4 files changed +15
-16
lines changed
4 files changed +15
-16
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ func Init() {
18
18
GlobalParams = append (GlobalParams , p )
19
19
log .Infof ("loaded config param: %s: %s" , quote (p .Key ), quote (p .Val ))
20
20
}
21
-
22
21
for _ , s := range switches {
23
22
GlobalSwitches = append (GlobalSwitches , s )
24
23
log .Infof ("loaded config switch: %s: %t" , quote (s .Key ), s .Val )
Original file line number Diff line number Diff line change @@ -17,11 +17,6 @@ var switches = []*Switch{
17
17
Val : true ,
18
18
Label : "Enable Status Header" ,
19
19
},
20
- & Switch {
21
- Key : "loggingEnabled" ,
22
- Val : false ,
23
- Label : "Enable Logging Server" ,
24
- },
25
20
}
26
21
27
22
type Switch struct {
Original file line number Diff line number Diff line change 1
1
package logging
2
2
3
3
import (
4
+ "os"
4
5
"time"
5
6
6
7
"github.com/op/go-logging"
@@ -13,7 +14,7 @@ const (
13
14
var (
14
15
Log * CTopLogger
15
16
exited bool
16
- level = logging .INFO
17
+ level = logging .INFO // default level
17
18
format = logging .MustStringFormatter (
18
19
`%{color}%{time:15:04:05.000} ▶ %{level:.4s} %{id:03x}%{color:reset} %{message}` ,
19
20
)
@@ -33,6 +34,11 @@ func Init() *CTopLogger {
33
34
logging .NewMemoryBackend (size ),
34
35
}
35
36
37
+ if debugMode () {
38
+ level = logging .DEBUG
39
+ StartServer ()
40
+ }
41
+
36
42
backendLvl := logging .AddModuleLevel (Log .backend )
37
43
backendLvl .SetLevel (level , "" )
38
44
@@ -71,3 +77,5 @@ func (log *CTopLogger) Exit() {
71
77
exited = true
72
78
StopServer ()
73
79
}
80
+
81
+ func debugMode () bool { return os .Getenv ("CTOP_DEBUG" ) == "1" }
Original file line number Diff line number Diff line change 25
25
func main () {
26
26
defer panicExit ()
27
27
28
- // init global config
29
- config .Init ()
30
-
31
28
// parse command line arguments
32
29
var versionFlag = flag .Bool ("v" , false , "output version information and exit" )
33
30
var helpFlag = flag .Bool ("h" , false , "display this help dialog" )
@@ -48,6 +45,12 @@ func main() {
48
45
os .Exit (0 )
49
46
}
50
47
48
+ // init logger
49
+ log = logging .Init ()
50
+
51
+ // init global config
52
+ config .Init ()
53
+
51
54
// override default config values with command line flags
52
55
if * filterFlag != "" {
53
56
config .Update ("filterStr" , * filterFlag )
@@ -66,12 +69,6 @@ func main() {
66
69
config .Toggle ("sortReversed" )
67
70
}
68
71
69
- // init logger
70
- log = logging .Init ()
71
- if config .GetSwitchVal ("loggingEnabled" ) {
72
- logging .StartServer ()
73
- }
74
-
75
72
// init ui
76
73
if * invertFlag {
77
74
InvertColorMap ()
You can’t perform that action at this time.
0 commit comments