Fix journald logger #1674

Merged
dstepanov-yadro merged 2 commits from dstepanov-yadro/frostfs-node:fix/fix_logger_unused into master 2025-03-13 12:14:24 +00:00

View file

@ -2,6 +2,7 @@ package logger
import (
"fmt"
"time"
"git.frostfs.info/TrueCloudLab/zapjournald"
"github.com/ssgreg/journald"
@ -147,8 +148,6 @@ func newJournaldLogger(prm *Prm) (*Logger, error) {
lvl := zap.NewAtomicLevelAt(prm.level)
c := zap.NewProductionConfig()
c.Level = lvl
c.Encoding = "console"
if prm.SamplingHook != nil {
c.Sampling.Hook = prm.SamplingHook
}
@ -168,7 +167,18 @@ func newJournaldLogger(prm *Prm) (*Logger, error) {
zapjournald.SyslogPid(),
})
lZap := zap.New(coreWithContext, zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)), zap.AddCallerSkip(1))
var samplerOpts []zapcore.SamplerOption
if c.Sampling.Hook != nil {
samplerOpts = append(samplerOpts, zapcore.SamplerHook(c.Sampling.Hook))
}
samplingCore := zapcore.NewSamplerWithOptions(
coreWithContext,
time.Second,
c.Sampling.Initial,
c.Sampling.Thereafter,
samplerOpts...,
)
lZap := zap.New(samplingCore, zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)), zap.AddCallerSkip(1))
l := &Logger{z: lZap, lvl: lvl}
prm._log = l