Move NewLogger to function
This commit is contained in:
+12
-10
@@ -31,10 +31,18 @@ func Init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Logger = NewLogger(cfg.Mod["format"], cfg.Mod["level"])
|
||||||
|
|
||||||
|
modules = cfg.Mod
|
||||||
|
|
||||||
|
path, _ := os.Getwd()
|
||||||
|
log.Debug().Str("os", runtime.GOOS).Str("arch", runtime.GOARCH).
|
||||||
|
Str("cwd", path).Int("conf_size", len(data)).Msgf("[app]")
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLogger(format string, level string) zerolog.Logger {
|
||||||
var writer io.Writer = os.Stdout
|
var writer io.Writer = os.Stdout
|
||||||
|
|
||||||
// styles
|
|
||||||
format := cfg.Mod["format"]
|
|
||||||
if format != "json" {
|
if format != "json" {
|
||||||
writer = zerolog.ConsoleWriter{
|
writer = zerolog.ConsoleWriter{
|
||||||
Out: writer, TimeFormat: "15:04:05.000",
|
Out: writer, TimeFormat: "15:04:05.000",
|
||||||
@@ -44,18 +52,12 @@ func Init() {
|
|||||||
|
|
||||||
zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMs
|
zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMs
|
||||||
|
|
||||||
lvl, err := zerolog.ParseLevel(cfg.Mod["level"])
|
lvl, err := zerolog.ParseLevel(level)
|
||||||
if err != nil || lvl == zerolog.NoLevel {
|
if err != nil || lvl == zerolog.NoLevel {
|
||||||
lvl = zerolog.InfoLevel
|
lvl = zerolog.InfoLevel
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Logger = zerolog.New(writer).With().Timestamp().Logger().Level(lvl)
|
return zerolog.New(writer).With().Timestamp().Logger().Level(lvl)
|
||||||
|
|
||||||
modules = cfg.Mod
|
|
||||||
|
|
||||||
path, _ := os.Getwd()
|
|
||||||
log.Debug().Str("os", runtime.GOOS).Str("arch", runtime.GOARCH).
|
|
||||||
Str("cwd", path).Int("conf_size", len(data)).Msgf("[app]")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadConfig(v interface{}) {
|
func LoadConfig(v interface{}) {
|
||||||
|
|||||||
Reference in New Issue
Block a user