Skip to content

Commit

Permalink
Avoid nil check for entry field in logger (#314)
Browse files Browse the repository at this point in the history
  • Loading branch information
SupriyaKasten authored and mergify[bot] committed Sep 23, 2019
1 parent 02da4f8 commit df1a364
Showing 1 changed file with 17 additions and 19 deletions.
36 changes: 17 additions & 19 deletions pkg/log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,25 @@ type logger struct {
}

func Info() Logger {
return &logger{level: InfoLevel}

return &logger{
level: InfoLevel,
entry: logrus.NewEntry(logrus.New()),
}
}

func Error() Logger {
return &logger{level: ErrorLevel}
return &logger{
level: ErrorLevel,
entry: logrus.NewEntry(logrus.New()),
}
}

func Debug() Logger {
return &logger{level: DebugLevel}
return &logger{
level: DebugLevel,
entry: logrus.NewEntry(logrus.New()),
}
}

// Print adds `msg` to the log at `InfoLevel`. It is a wrapper for `Info().Print(msg)`, since this is the most common use case.
Expand All @@ -49,7 +59,7 @@ func WithContext(ctx context.Context) {
}

func WithError(err error) {
Error().WithError(err)
Info().WithError(err)
}

func (l *logger) Print(msg string) {
Expand All @@ -60,11 +70,7 @@ func (l *logger) Print(msg string) {
}
}

if l.entry != nil {
l.entry = l.entry.WithFields(logFields)
} else {
l.entry = logrus.WithFields(logFields)
}
l.entry = l.entry.WithFields(logFields)

switch l.level {
case InfoLevel:
Expand All @@ -78,20 +84,12 @@ func (l *logger) Print(msg string) {

func (l *logger) WithContext(ctx context.Context) Logger {
l.ctx = ctx
if l.entry != nil {
l.entry = l.entry.WithContext(ctx)
} else {
l.entry = logrus.WithContext(ctx)
}
l.entry = l.entry.WithContext(ctx)
return l
}

func (l *logger) WithError(err error) Logger {
l.err = err
if l.entry != nil {
l.entry = l.entry.WithError(err)
} else {
l.entry = logrus.WithError(err)
}
l.entry = l.entry.WithError(err)
return l
}

0 comments on commit df1a364

Please sign in to comment.