Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow to use specific logrus level in the adaptor #962

Merged
merged 7 commits into from Mar 10, 2020
Merged

allow to use specific logrus level in the adaptor #962

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc23620
allow to use specific logrus level in the adaptor
taraspos Feb 21, 2020
c8e7841
set logrus level using the option function approach
taraspos Feb 21, 2020
fb6b3fa
Make Option exported, rename logrusLogger just to Logger
taraspos Feb 24, 2020
9368a66
add tests for the WithLevel feature
taraspos Feb 24, 2020
d9bb21b
remove unnecessary log keys
taraspos Feb 27, 2020
5ae12b6
make logrus logger fields unexported
taraspos Mar 9, 2020
0b4e97f
update NewLogger comment
taraspos Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 22 additions & 2 deletions log/logrus/logrus_logger.go
View file
Open in desktop
Expand Up @@ -12,13 +12,20 @@ import (

type logrusLogger struct {
logrus.FieldLogger
taraspos marked this conversation as resolved.
Show resolved Hide resolved
logrus.Level
taraspos marked this conversation as resolved.
Show resolved Hide resolved
taraspos marked this conversation as resolved.
Show resolved Hide resolved
}

var errMissingValue = errors.New("(MISSING)")

// NewLogrusLogger returns a go-kit log.Logger that sends log events to a Logrus logger.
func NewLogrusLogger(logger logrus.FieldLogger) log.Logger {
return &logrusLogger{logger}
return &logrusLogger{logger, logrus.InfoLevel}
}

// NewLogrusLoggerWithLevel returns a go-kit log.Logger that sends log events to a Logrus logger, which
// will be logged with provided error level
func NewLogrusLoggerWithLevel(logger logrus.FieldLogger, level logrus.Level) log.Logger {
ChrisHines marked this conversation as resolved.
Show resolved Hide resolved
return &logrusLogger{logger, level}
}

func (l logrusLogger) Log(keyvals ...interface{}) error {
Expand All @@ -30,6 +37,19 @@ func (l logrusLogger) Log(keyvals ...interface{}) error {
fields[fmt.Sprint(keyvals[i])] = errMissingValue
}
}
l.WithFields(fields).Info()

switch l.Level {
case logrus.InfoLevel:
l.WithFields(fields).Info()
case logrus.ErrorLevel:
l.WithFields(fields).Error()
case logrus.DebugLevel:
l.WithFields(fields).Debug()
case logrus.WarnLevel:
l.WithFields(fields).Warn()
default:
l.WithFields(fields).Print()
}

return nil
}