ing

glide.yaml

@@ -1,5 +1,4 @@
 package: git.loafle.net/commons_go/logging
 import:
-- package: github.com/uber-go/zap
 - package: go.uber.org/zap
   version: v1.5.0

logging.go

@@ -5,34 +5,37 @@ import (
 	"os"
 	"path"
 
-	"github.com/uber-go/zap"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 type loggerKeyType int
 
 const loggerKey loggerKeyType = iota
 
-var defaultLogger zap.Logger
+var defaultLogger *zap.Logger
 
 func init() {
-	defaultLogger = zap.New(
+	l, _ := zap.NewDevelopment()
-		zap.NewJSONEncoder(zap.TimeFormatter(TimestampField)),
+	defaultLogger = l.With(
-		zap.Fields(zap.Int("pid", os.Getpid())),
+		zap.Int("pid", os.Getpid()),
 		zap.String("exe", path.Base(os.Args[0])),
 	)
 }
 
-func NewContext(ctx context.Context, fields ...zap.Field) context.Context {
+func NewContext(ctx context.Context, logger *zap.Logger, fields ...zapcore.Field) context.Context {
+	if nil != logger {
+		return context.WithValue(ctx, loggerKey, logger.With(fields...))
+	}
 	return context.WithValue(ctx, loggerKey, WithContext(ctx).With(fields...))
 }
 
-func WithContext(ctx context.Context) zap.Logger {
+func WithContext(ctx context.Context) *zap.Logger {
 	if ctx == nil {
 		return defaultLogger
 	}
-	if ctxLogger, ok := ctx.Value(loggerKey).(zap.Logger); ok {
+	if ctxLogger, ok := ctx.Value(loggerKey).(*zap.Logger); ok {
 		return ctxLogger
-	} else {
-		return defaultLogger
 	}
+	return defaultLogger
 }