TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 105 Pull requests 3 Projects Releases 2 Activity Actions

Logger with context #1437

Merged
fyrchik merged 8 commits from dstepanov-yadro/frostfs-node:feat/log_with_ctx into master 2024-11-20 15:43:53 +00:00
Conversation 1 Commits 8 Files changed 302 +3 -2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 612b34d570 - Show all commits

5
pkg/util/logger/logger.go
View file

@ -131,6 +131,7 @@ func newConsoleLogger(prm *Prm) (*Logger, error) {
lZap, err := c.Build( lZap, err := c.Build(
zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)), zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)),
zap.AddCallerSkip(1),
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -167,7 +168,7 @@ func newJournaldLogger(prm *Prm) (*Logger, error) {
zapjournald.SyslogPid(), zapjournald.SyslogPid(),
}) })
lZap := zap.New(coreWithContext, zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel))) lZap := zap.New(coreWithContext, zap.AddStacktrace(zap.NewAtomicLevelAt(zap.FatalLevel)), zap.AddCallerSkip(1))
l := &Logger{z: lZap, lvl: lvl} l := &Logger{z: lZap, lvl: lvl}
prm._log = l prm._log = l
@ -190,6 +191,6 @@ func (l *Logger) With(fields ...zap.Field) *Logger {
func NewLoggerWrapper(z *zap.Logger) *Logger { func NewLoggerWrapper(z *zap.Logger) *Logger {
return &Logger{ return &Logger{
z: z, z: z.WithOptions(zap.AddCallerSkip(1)),
} }
} }