-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #57 from aserto-dev/logrus
Logging helper to wire logrus to zerolog
- Loading branch information
Showing
3 changed files
with
77 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package logger | ||
|
|
||
| import ( | ||
| "io" | ||
|
|
||
| "github.com/aserto-dev/logger" | ||
| "github.com/rs/zerolog" | ||
| "github.com/sirupsen/logrus" // nolint // we're only using logrus to make sure any packages using it still end up to zerolog | ||
| ) | ||
|
|
||
| func NewLogger(logOutput logger.Writer, errorOutput logger.ErrWriter, cfg *logger.Config) (*zerolog.Logger, error) { | ||
| log, err := logger.NewLogger(logOutput, errorOutput, cfg) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| addLogrusHook(log) | ||
|
|
||
| return log, nil | ||
| } | ||
|
|
||
| func addLogrusHook(log *zerolog.Logger) { | ||
| logrusLogger := log.With().Str("log-source", "logrus").Logger() | ||
| logrus.AddHook(&logrusHook{logger: &logrusLogger}) | ||
| logrus.SetLevel(logrus.TraceLevel) | ||
| logrus.SetOutput(io.Discard) | ||
|
|
||
| } | ||
|
|
||
| // logrusHook is a logrus hook that writes to zerolog. | ||
| type logrusHook struct { | ||
| logger *zerolog.Logger | ||
| } | ||
|
|
||
| var _ logrus.Hook = &logrusHook{} | ||
|
|
||
| // Fire will be called when some logging function is called. | ||
| func (hook *logrusHook) Fire(entry *logrus.Entry) error { | ||
| switch entry.Level { | ||
| case logrus.PanicLevel: | ||
| hook.logger.Panic().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.FatalLevel: | ||
| hook.logger.Fatal().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.ErrorLevel: | ||
| hook.logger.Error().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.WarnLevel: | ||
| hook.logger.Warn().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.InfoLevel: | ||
| hook.logger.Info().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.DebugLevel: | ||
| hook.logger.Debug().Fields(entry.Data).Msg(entry.Message) | ||
| case logrus.TraceLevel: | ||
| hook.logger.Trace().Fields(entry.Data).Msg(entry.Message) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // Levels defines on which log levels this hook would trigger. | ||
| func (hook *logrusHook) Levels() []logrus.Level { | ||
| return []logrus.Level{ | ||
| logrus.PanicLevel, | ||
| logrus.FatalLevel, | ||
| logrus.ErrorLevel, | ||
| logrus.WarnLevel, | ||
| logrus.InfoLevel, | ||
| logrus.DebugLevel, | ||
| logrus.TraceLevel, | ||
| } | ||
| } |