From dd16fb160a4859ef7f0b0ef07a7a02c7e6d661d3 Mon Sep 17 00:00:00 2001 From: wahidw Date: Tue, 18 May 2021 16:19:34 +0000 Subject: [PATCH] Taking latest golog version Signed-off-by: wahidw Change-Id: I128be2056d1c2e73d208675445fbe7f9ddfd1c2c --- go.mod | 4 ++-- pkg/appmgr/appmgr.go | 22 ++++++++++++++++++++-- pkg/logger/logger.go | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index ef703c7..b94603b 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.12 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2 -replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.1 +replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2 require ( - gerrit.o-ran-sc.org/r/com/golog v0.0.1 + gerrit.o-ran-sc.org/r/com/golog v0.0.2 gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.0.0-00010101000000-000000000000 github.com/BurntSushi/toml v0.3.1 // indirect github.com/RaveNoX/go-jsonmerge v1.0.0 diff --git a/pkg/appmgr/appmgr.go b/pkg/appmgr/appmgr.go index 0e2196d..31af3e9 100755 --- a/pkg/appmgr/appmgr.go +++ b/pkg/appmgr/appmgr.go @@ -50,10 +50,26 @@ func parseCmd() string { func watch() { viper.WatchConfig() viper.OnConfigChange(func(e fsnotify.Event) { - log.Println("config file changed ", e.Name) + Logger.Info("config file changed ", e.Name) + setLoglevel() }) } +func setLoglevel() { + var loglevel int + viper.UnmarshalKey("loglevel", &loglevel) + switch loglevel { + case 1: + Logger.Info("LOGLEVEL is set to ERROR\n") + case 2: + Logger.Info("LOGLEVEL is set to WARNING\n") + case 3: + Logger.Info("LOGLEVEL is set to INFO\n") + case 4: + Logger.Info("LOGLEVEL is set to DEBUG\n") + } + Logger.SetLevel(loglevel) +} func loadConfig() { viper.SetConfigFile(parseCmd()) if err := viper.ReadInConfig(); err != nil { @@ -68,5 +84,7 @@ func loadConfig() { func Init() { loadConfig() Logger = logger.NewLogger("appmgr") - Logger.SetMdc("xm", "0.4.3") + Logger.SetFormat(0) + Logger.SetMdc("xm", "0.4.3") + setLoglevel() } diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 251e90f..d00dd23 100755 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -35,6 +35,10 @@ func NewLogger(name string) *Log { } } +func (l *Log) SetFormat(logMonitor int) { + l.logger.Mdclog_format_initialize(logMonitor) +} + func (l *Log) SetLevel(level int) { l.logger.LevelSet(mdclog.Level(level)) } -- 2.16.6