Mirrored_Repos/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2024-08-30 18:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

add logging back to config, move logging server start to main package

Browse Source
This commit is contained in:
Bradley Cicenas 2017-02-12 05:14:50 +00:00
parent 4450abf89b
commit d5d91398f5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/main.go
View File

@ -2,10 +2,13 @@ package config
import ( import (
"os" "os"
"github.com/bcicen/ctop/logging"
) )
var ( var (
Global = NewDefaultConfig() Global = NewDefaultConfig()
log = logging.Init()
configChan = make(chan ConfigMsg) configChan = make(chan ConfigMsg)
) )
@ -17,7 +20,7 @@ type ConfigMsg struct {
} }
func Update(k, v string) { 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} configChan <- ConfigMsg{k, v}
} }

8
logging/main.go
View File

@ -28,7 +28,7 @@ type CTopLogger struct {
backend *logging.MemoryBackend backend *logging.MemoryBackend
} }
func Init(serverEnabled string) *CTopLogger { func Init() *CTopLogger {
if Log == nil { if Log == nil {
Log = &CTopLogger{ Log = &CTopLogger{
logging.MustGetLogger("ctop"), logging.MustGetLogger("ctop"),
@ -38,10 +38,6 @@ func Init(serverEnabled string) *CTopLogger {
backendFmt := logging.NewBackendFormatter(Log.backend, format) backendFmt := logging.NewBackendFormatter(Log.backend, format)
logging.SetBackend(backendFmt) logging.SetBackend(backendFmt)
Log.Notice("logger initialized") Log.Notice("logger initialized")
if serverEnabled == "1" {
Log.Serve()
}
} }
return Log return Log
} }
@ -51,7 +47,7 @@ func (log *CTopLogger) Exit() {
wg.Wait() wg.Wait()
} }
func (log *CTopLogger) Serve() { func (log *CTopLogger) StartServer() {
ln, err := net.Listen("unix", path) ln, err := net.Listen("unix", path)
if err != nil { if err != nil {
panic(err) panic(err)

5
main.go
View File

@ -9,7 +9,10 @@ import (
var log *logging.CTopLogger var log *logging.CTopLogger
func main() { func main() {
log = logging.Init(config.Global["loggingEnabled"]) log = logging.Init()
if config.Global["loggingEnabled"] == "1" {
log.StartServer()
}
if err := ui.Init(); err != nil { if err := ui.Init(); err != nil {
panic(err) panic(err)
} }