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.

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

allow to use specific logrus level in the adaptor #962

Merged
merged 7 commits into from Mar 10, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
45 changes: 39 additions & 6 deletions log/logrus/logrus_logger.go
Expand Up @@ -10,18 +10,38 @@ import (
"github.com/sirupsen/logrus"
)

type logrusLogger struct {
type Logger 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
}

type Option func(*Logger)

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}
// NewLogger returns a go-kit log.Logger that sends log events to a Logrus logger.
taraspos marked this conversation as resolved.
Show resolved Hide resolved
func NewLogger(logger logrus.FieldLogger, options ...Option) log.Logger {
l := &Logger{
FieldLogger: logger,
Level: logrus.InfoLevel,
}

for _, optFunc := range options {
optFunc(l)
}

return l
}

func (l logrusLogger) Log(keyvals ...interface{}) error {
// WithLevel configures a logrus logger to set specific log
// level to log messages with
taraspos marked this conversation as resolved.
Show resolved Hide resolved
func WithLevel(level logrus.Level) Option {
return func(c *Logger) {
c.Level = level
}
}

func (l Logger) Log(keyvals ...interface{}) error {
fields := logrus.Fields{}
for i := 0; i < len(keyvals); i += 2 {
if i+1 < len(keyvals) {
Expand All @@ -30,6 +50,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
}
2 changes: 1 addition & 1 deletion log/logrus/logrus_logger_test.go
Expand Up @@ -16,7 +16,7 @@ func TestLogrusLogger(t *testing.T) {
logrusLogger := logrus.New()
logrusLogger.Out = buf
logrusLogger.Formatter = &logrus.TextFormatter{TimestampFormat: "02-01-2006 15:04:05", FullTimestamp: true}
logger := log.NewLogrusLogger(logrusLogger)
logger := log.NewLogger(logrusLogger)

if err := logger.Log("hello", "world"); err != nil {
t.Fatal(err)
Expand Down