|
@@ -6,6 +6,7 @@ import (
|
|
|
"os"
|
|
"os"
|
|
|
"path/filepath"
|
|
"path/filepath"
|
|
|
"runtime/debug"
|
|
"runtime/debug"
|
|
|
|
|
+ "strings"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
var logger *zap.Logger
|
|
var logger *zap.Logger
|
|
@@ -27,7 +28,6 @@ func init() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
developmentEncoderConfig := zap.NewDevelopmentEncoderConfig()
|
|
developmentEncoderConfig := zap.NewDevelopmentEncoderConfig()
|
|
|
- developmentEncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
|
|
|
|
|
|
|
|
|
|
encoder := zapcore.NewConsoleEncoder(developmentEncoderConfig)
|
|
encoder := zapcore.NewConsoleEncoder(developmentEncoderConfig)
|
|
|
core := zapcore.NewTee(
|
|
core := zapcore.NewTee(
|
|
@@ -59,11 +59,21 @@ func Warning(serviceName string, funcName string, callName string, message strin
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func getCallerInfoForLog(serviceName string, funcName string, callName string) []zap.Field {
|
|
func getCallerInfoForLog(serviceName string, funcName string, callName string) []zap.Field {
|
|
|
- return []zap.Field{
|
|
|
|
|
- zap.String("service", serviceName),
|
|
|
|
|
- zap.String("function", funcName),
|
|
|
|
|
- zap.String("call", callName),
|
|
|
|
|
|
|
+ fields := make([]zap.Field, 0)
|
|
|
|
|
+
|
|
|
|
|
+ if strings.Trim(serviceName, " ") != "" {
|
|
|
|
|
+ fields = append(fields, zap.String("service", serviceName))
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if strings.Trim(funcName, " ") != "" {
|
|
|
|
|
+ fields = append(fields, zap.String("function", funcName))
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if strings.Trim(callName, " ") != "" {
|
|
|
|
|
+ fields = append(fields, zap.String("call", callName))
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return fields
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func pathExists(path string) bool {
|
|
func pathExists(path string) bool {
|