restore v0.3.0

handler/zap/logger.go

@@ -0,0 +1,95 @@
+package zap
+
+import (
+	"context"
+
+	"gitoa.ru/go-4devs/log"
+	"gitoa.ru/go-4devs/log/entry"
+	"gitoa.ru/go-4devs/log/level"
+	"go.uber.org/zap"
+)
+
+// Option configure logger.
+type Option func(*logger)
+
+// WithLevel sets level logged message.
+func WithLevel(level level.Level, f func(z *zap.Logger, msg string, fields ...zap.Field)) Option {
+	return func(l *logger) {
+		l.levels[level] = f
+	}
+}
+
+// WithZap sets zap logger.
+func WithZap(z *zap.Logger) Option {
+	return func(l *logger) {
+		l.zap = z
+	}
+}
+
+// New create handler by zap logger.
+func New(opts ...Option) log.Logger {
+	z, err := zap.NewDevelopment()
+	if err != nil {
+		panic(err)
+	}
+
+	log := logger{
+		zap: z,
+		levels: map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field){
+			level.Emergency: fatalLog,
+			level.Alert:     panicLog,
+			level.Critical:  errorLog,
+			level.Error:     errorLog,
+			level.Warning:   warnLog,
+			level.Notice:    infoLog,
+			level.Info:      infoLog,
+			level.Debug:     debugLog,
+		},
+	}
+
+	for _, opt := range opts {
+		opt(&log)
+	}
+
+	return log.log
+}
+
+type logger struct {
+	zap    *zap.Logger
+	levels map[level.Level]func(z *zap.Logger, msg string, fields ...zap.Field)
+}
+
+func (l *logger) log(ctx context.Context, e *entry.Entry) (int, error) {
+	zf := make([]zap.Field, e.Fields().Len())
+	for i, field := range e.Fields() {
+		zf[i] = zap.Any(string(field.Key()), field.AsInterface())
+	}
+
+	l.levels[e.Level()](l.zap, e.Message(), zf...)
+
+	return 0, nil
+}
+
+func panicLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Panic(msg, fields...)
+}
+
+func fatalLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Fatal(msg, fields...)
+}
+
+func errorLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Error(msg, fields...)
+}
+
+func warnLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Warn(msg, fields...)
+}
+
+func infoLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Info(msg, fields...)
+}
+
+func debugLog(z *zap.Logger, msg string, fields ...zap.Field) {
+	z.Debug(msg, fields...)
+}

handler/zap/logger_test.go

@@ -0,0 +1,41 @@
+package zap_test
+
+import (
+	"bytes"
+	"context"
+	"testing"
+
+	"gitoa.ru/go-4devs/log/entry"
+	"gitoa.ru/go-4devs/log/field"
+	zlog "gitoa.ru/go-4devs/log/handler/zap"
+	"gitoa.ru/go-4devs/log/level"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+func TestNew(t *testing.T) {
+	ctx := context.Background()
+	buf := &bytes.Buffer{}
+	core := zapcore.NewCore(zapcore.NewJSONEncoder(zapcore.EncoderConfig{
+		MessageKey:     "msg",
+		LevelKey:       "level",
+		NameKey:        "logger",
+		EncodeLevel:    zapcore.LowercaseLevelEncoder,
+		EncodeTime:     zapcore.ISO8601TimeEncoder,
+		EncodeDuration: zapcore.StringDurationEncoder,
+	}), zapcore.AddSync(buf), zapcore.DebugLevel)
+	logger := zlog.New(zlog.WithZap(zap.New(core)))
+	expect := `{"level":"info","msg":"handle zap message","env":"test"}` + "\n"
+
+	if _, err := logger(ctx, entry.New(
+		entry.WithFields(field.String("env", "test")),
+		entry.WithLevel(level.Notice),
+		entry.WithMessage("handle zap message"),
+	)); err != nil {
+		t.Error(err)
+	}
+
+	if buf.String() != expect {
+		t.Errorf("invalid message\n got: %s\nexpect:%s\n", buf.String(), expect)
+	}
+}