add caller

dipperin · Dec 18, 2019 · ec4f97a · ec4f97a
1 parent bf44f95
commit ec4f97a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/log/log.go b/log/log.go
@@ -11,6 +11,7 @@ import (
 	"runtime"
 	"strconv"
 	"sync"
+	"time"
 )
 
 var QyLogger *zap.Logger
@@ -66,7 +67,7 @@ func newLogCore(lvl zapcore.Level, targetDir, logFileName string, withConsole bo
 
 	eConfig := zap.NewProductionEncoderConfig()
 	eConfig.EncodeDuration = zapcore.SecondsDurationEncoder
-	eConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	eConfig.EncodeTime = qyTimeEncoder
 
 	if withCaller {
 		eConfig.EncodeCaller = qyCallerEncoder
@@ -159,6 +160,10 @@ func getErrOutSink(outputPath string, withConsole bool) zapcore.WriteSyncer {
 	return getSink(outputPath, []string{"stdout", "stderr"}, withConsole)
 }
 
+func qyTimeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
+	enc.AppendString(t.Format("2006-01-02 15:04:05.000"))
+}
+
 func qyCallerEncoder(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {
 	enc.AppendString(printHostName() + "	" + printMyName())
 }

diff --git a/log/log_test.go b/log/log_test.go
@@ -72,7 +72,7 @@ func Test_pathExists(t *testing.T) {
 }
 
 func TestTrace(t *testing.T) {
-	InitLogger(zap.DebugLevel, "", "", true)
+	InitLoggerWithCaller(zap.DebugLevel, "", "", true)
 
 	QyLogger.Info("aaaaaaa")