[#493] logger: Do not set global fields in constructor
Remove setting of `app_name` and `app_version` fields in `NewLogger` constructor. Set these fields in Node and IR application in already constructed log and remove them from viper . Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
d17526f8ac
commit
2a970b0125
4 changed files with 11 additions and 17 deletions
|
@ -18,9 +18,6 @@ func newConfig(path string) (*viper.Viper, error) {
|
||||||
v.AutomaticEnv()
|
v.AutomaticEnv()
|
||||||
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
|
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
|
||||||
|
|
||||||
v.SetDefault("app.name", misc.InnerRingName)
|
|
||||||
v.SetDefault("app.version", misc.Version)
|
|
||||||
|
|
||||||
defaultConfiguration(v)
|
defaultConfiguration(v)
|
||||||
|
|
||||||
if path != "" {
|
if path != "" {
|
||||||
|
|
|
@ -47,6 +47,11 @@ func main() {
|
||||||
log, err := logger.NewLogger(cfg)
|
log, err := logger.NewLogger(cfg)
|
||||||
exitErr(err)
|
exitErr(err)
|
||||||
|
|
||||||
|
log = log.With(
|
||||||
|
zap.String("app_name", misc.InnerRingName),
|
||||||
|
zap.String("app_version", misc.Version),
|
||||||
|
)
|
||||||
|
|
||||||
ctx := grace.NewGracefulContext(log)
|
ctx := grace.NewGracefulContext(log)
|
||||||
intErr := make(chan error) // internal inner ring errors
|
intErr := make(chan error) // internal inner ring errors
|
||||||
|
|
||||||
|
|
|
@ -355,6 +355,11 @@ func initCfg(path string) *cfg {
|
||||||
log, err := logger.NewLogger(viperCfg)
|
log, err := logger.NewLogger(viperCfg)
|
||||||
fatalOnErr(err)
|
fatalOnErr(err)
|
||||||
|
|
||||||
|
log = log.With(
|
||||||
|
zap.String("app_name", misc.NodeName),
|
||||||
|
zap.String("app_version", misc.Version),
|
||||||
|
)
|
||||||
|
|
||||||
netAddr, err := network.AddressFromString(viperCfg.GetString(cfgBootstrapAddress))
|
netAddr, err := network.AddressFromString(viperCfg.GetString(cfgBootstrapAddress))
|
||||||
fatalOnErr(err)
|
fatalOnErr(err)
|
||||||
|
|
||||||
|
@ -442,9 +447,6 @@ func initViper(path string) *viper.Viper {
|
||||||
v.AutomaticEnv()
|
v.AutomaticEnv()
|
||||||
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
|
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
|
||||||
|
|
||||||
v.SetDefault("app.name", misc.NodeName)
|
|
||||||
v.SetDefault("app.version", misc.Version)
|
|
||||||
|
|
||||||
defaultConfiguration(v)
|
defaultConfiguration(v)
|
||||||
|
|
||||||
if path != "" {
|
if path != "" {
|
||||||
|
|
|
@ -27,20 +27,10 @@ func NewLogger(v *viper.Viper) (*Logger, error) {
|
||||||
c.Encoding = "console"
|
c.Encoding = "console"
|
||||||
c.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
|
c.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
|
||||||
|
|
||||||
l, err := c.Build(
|
return c.Build(
|
||||||
// record a stack trace for all messages at or above fatal level
|
// record a stack trace for all messages at or above fatal level
|
||||||
zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)),
|
zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)),
|
||||||
)
|
)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
name := v.GetString("app.name")
|
|
||||||
version := v.GetString("app.version")
|
|
||||||
|
|
||||||
return l.With(
|
|
||||||
zap.String("app_name", name),
|
|
||||||
zap.String("app_version", version)), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func safeLevel(lvl string) zap.AtomicLevel {
|
func safeLevel(lvl string) zap.AtomicLevel {
|
||||||
|
|
Loading…
Reference in a new issue