Make main logger global

This commit is contained in:
Alexey Khit
2022-11-03 10:26:26 +03:00
parent 616f69c88b
commit 6d432574bf
+6 -10
View File
@@ -3,6 +3,7 @@ package app
import ( import (
"flag" "flag"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"io" "io"
"os" "os"
@@ -48,7 +49,7 @@ func Init() {
lvl = zerolog.InfoLevel 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 modules = cfg.Mod
@@ -68,15 +69,13 @@ func LoadConfig(v interface{}) {
func GetLogger(module string) zerolog.Logger { func GetLogger(module string) zerolog.Logger {
if s, ok := modules[module]; ok { if s, ok := modules[module]; ok {
lvl, err := zerolog.ParseLevel(s) lvl, err := zerolog.ParseLevel(s)
if err != nil { if err == nil {
log.Warn().Err(err).Msg("[log]")
return log
}
return log.Level(lvl) return log.Level(lvl)
} }
log.Warn().Err(err).Caller().Send()
}
return log return log.Logger
} }
// internal // internal
@@ -84,8 +83,5 @@ func GetLogger(module string) zerolog.Logger {
// data - config content // data - config content
var data []byte var data []byte
// log - main logger
var log zerolog.Logger
// modules log levels // modules log levels
var modules map[string]string var modules map[string]string