internal: rework global logging settings, embedded outpost no longer overwrites core, clean up double init

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2021-12-20 21:23:19 +01:00
parent 3da526f20e
commit 621773c1ea
5 changed files with 54 additions and 36 deletions

View File

@ -2,6 +2,7 @@ package config
import (
"io/ioutil"
"strings"
env "github.com/Netflix/go-env"
"github.com/imdario/mergo"
@ -62,7 +63,7 @@ func FromEnv() error {
}
func ConfigureLogger() {
switch G.LogLevel {
switch strings.ToLower(G.LogLevel) {
case "trace":
log.SetLevel(log.TraceLevel)
case "debug":
@ -77,14 +78,14 @@ func ConfigureLogger() {
log.SetLevel(log.DebugLevel)
}
fm := log.FieldMap{
log.FieldKeyMsg: "event",
log.FieldKeyTime: "timestamp",
}
if G.Debug {
log.SetFormatter(&log.TextFormatter{})
log.SetFormatter(&log.TextFormatter{FieldMap: fm})
} else {
log.SetFormatter(&log.JSONFormatter{
FieldMap: log.FieldMap{
log.FieldKeyMsg: "event",
log.FieldKeyTime: "timestamp",
},
})
log.SetFormatter(&log.JSONFormatter{FieldMap: fm})
}
}