update zap/logrus hanler

handler/logrus/logger.go

@@ -9,82 +9,34 @@ import (
 	"gitoa.ru/go-4devs/log/level"
 )
 
-// Option configure logger.
-type Option func(*logger)
-
-// WithLevel sets callback level to log level.
-func WithLevel(level level.Level, c func(*logrus.Entry, string)) Option {
-	return func(l *logger) {
-		l.levels[level] = c
-	}
-}
-
-// WithLogrus sets logrus logger.
-func WithLogrus(logrus *logrus.Logger) Option {
-	return func(l *logger) {
-		l.logrus = logrus
-	}
+// Standard create new standart logrus handler.
+func Standard() log.Logger {
+	return New(logrus.StandardLogger())
 }
 
 // New create new logrus handler.
-func New(opts ...Option) log.Logger {
-	log := logger{
-		logrus: logrus.StandardLogger(),
-		levels: map[level.Level]func(*logrus.Entry, string){
-			level.Emergency: panicLog,
-			level.Alert:     fatalLog,
-			level.Critical:  errorLog,
-			level.Error:     errorLog,
-			level.Warning:   warnLog,
-			level.Notice:    infoLog,
-			level.Info:      infoLog,
-			level.Debug:     debugLog,
-		},
+func New(log *logrus.Logger) log.Logger {
+	return func(ctx context.Context, e *entry.Entry) (int, error) {
+		lrgFields := make(logrus.Fields, e.Fields().Len())
+		for _, field := range e.Fields() {
+			lrgFields[string(field.Key())] = field.AsInterface()
+		}
+		write := log.WithContext(ctx).WithFields(lrgFields)
+		switch e.Level() {
+		case level.Emergency:
+			write.Panic(e.Message())
+		case level.Alert:
+			write.Fatal(e.Message())
+		case level.Critical, level.Error:
+			write.Error(e.Message())
+		case level.Warning:
+			write.Warn(e.Message())
+		case level.Notice, level.Info:
+			write.Info(e.Message())
+		case level.Debug:
+			write.Debug(e.Message())
+		}
+
+		return 0, nil
 	}
-
-	for _, o := range opts {
-		o(&log)
-	}
-
-	return log.log
-}
-
-type logger struct {
-	levels map[level.Level]func(l *logrus.Entry, msg string)
-	logrus *logrus.Logger
-}
-
-func (l *logger) log(ctx context.Context, e *entry.Entry) (int, error) {
-	lrgFields := make(logrus.Fields, e.Fields().Len())
-	for _, field := range e.Fields() {
-		lrgFields[string(field.Key())] = field.AsInterface()
-	}
-
-	l.levels[e.Level()](l.logrus.WithFields(lrgFields), e.Message())
-
-	return 0, nil
-}
-
-func panicLog(e *logrus.Entry, msg string) {
-	e.Panic(msg)
-}
-
-func fatalLog(e *logrus.Entry, msg string) {
-	e.Fatal(msg)
-}
-
-func errorLog(e *logrus.Entry, msg string) {
-	e.Error(msg)
-}
-
-func warnLog(e *logrus.Entry, msg string) {
-	e.Warn(msg)
-}
-
-func infoLog(e *logrus.Entry, msg string) {
-	e.Info(msg)
-}
-
-func debugLog(e *logrus.Entry, msg string) {
-	e.Debug(msg)
 }

handler/logrus/logger_test.go

@@ -23,7 +23,7 @@ func TestNew(t *testing.T) {
 		DisableTimestamp: true,
 	})
 
-	handler := logrus.New(logrus.WithLogrus(lgrus))
+	handler := logrus.New(lgrus)
 	expect := "level=info msg=\"handle logrus message\"\n"
 
 	if _, err := handler(ctx, entry.New(entry.WithLevel(level.Info), entry.WithMessage("handle logrus message"))); err != nil {