From 6d432574bf2449087ed146e898967fd1cbf5fc91 Mon Sep 17 00:00:00 2001 From: Alexey Khit Date: Thu, 3 Nov 2022 10:26:26 +0300 Subject: [PATCH] Make main logger global --- cmd/app/app.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/cmd/app/app.go b/cmd/app/app.go index 4ad61169..7e9a1c92 100644 --- a/cmd/app/app.go +++ b/cmd/app/app.go @@ -3,6 +3,7 @@ package app import ( "flag" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" "io" "os" @@ -48,7 +49,7 @@ func Init() { lvl = zerolog.InfoLevel } - log = zerolog.New(writer).With().Timestamp().Logger().Level(lvl) + log.Logger = zerolog.New(writer).With().Timestamp().Logger().Level(lvl) modules = cfg.Mod @@ -68,15 +69,13 @@ func LoadConfig(v interface{}) { func GetLogger(module string) zerolog.Logger { if s, ok := modules[module]; ok { lvl, err := zerolog.ParseLevel(s) - if err != nil { - log.Warn().Err(err).Msg("[log]") - return log + if err == nil { + return log.Level(lvl) } - - return log.Level(lvl) + log.Warn().Err(err).Caller().Send() } - return log + return log.Logger } // internal @@ -84,8 +83,5 @@ func GetLogger(module string) zerolog.Logger { // data - config content var data []byte -// log - main logger -var log zerolog.Logger - // modules log levels var modules map[string]string