diff --git a/config/main.go b/config/main.go index 3b0461d..8d6c2fd 100644 --- a/config/main.go +++ b/config/main.go @@ -2,10 +2,13 @@ package config import ( "os" + + "github.com/bcicen/ctop/logging" ) var ( Global = NewDefaultConfig() + log = logging.Init() configChan = make(chan ConfigMsg) ) @@ -17,7 +20,7 @@ type ConfigMsg struct { } func Update(k, v string) { - //log.Noticef("config update: %s = %s", k, v) + log.Noticef("config update: %s = %s", k, v) configChan <- ConfigMsg{k, v} } diff --git a/logging/main.go b/logging/main.go index 915a49c..fa28123 100644 --- a/logging/main.go +++ b/logging/main.go @@ -28,7 +28,7 @@ type CTopLogger struct { backend *logging.MemoryBackend } -func Init(serverEnabled string) *CTopLogger { +func Init() *CTopLogger { if Log == nil { Log = &CTopLogger{ logging.MustGetLogger("ctop"), @@ -38,10 +38,6 @@ func Init(serverEnabled string) *CTopLogger { backendFmt := logging.NewBackendFormatter(Log.backend, format) logging.SetBackend(backendFmt) Log.Notice("logger initialized") - - if serverEnabled == "1" { - Log.Serve() - } } return Log } @@ -51,7 +47,7 @@ func (log *CTopLogger) Exit() { wg.Wait() } -func (log *CTopLogger) Serve() { +func (log *CTopLogger) StartServer() { ln, err := net.Listen("unix", path) if err != nil { panic(err) diff --git a/main.go b/main.go index 2496cbd..e0e97f6 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,10 @@ import ( var log *logging.CTopLogger func main() { - log = logging.Init(config.Global["loggingEnabled"]) + log = logging.Init() + if config.Global["loggingEnabled"] == "1" { + log.StartServer() + } if err := ui.Init(); err != nil { panic(err) }