|
@@ -82,30 +82,20 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
|
|
|
CallerKey: "caller",
|
|
|
StacktraceKey: global.GVA_CONFIG.Zap.StacktraceKey,
|
|
|
LineEnding: zapcore.DefaultLineEnding,
|
|
|
- EncodeLevel: zapcore.CapitalLevelEncoder,
|
|
|
+ EncodeLevel: zapcore.LowercaseLevelEncoder,
|
|
|
EncodeTime: CustomTimeEncoder,
|
|
|
EncodeDuration: zapcore.SecondsDurationEncoder,
|
|
|
EncodeCaller: zapcore.FullCallerEncoder,
|
|
|
}
|
|
|
switch {
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console" :
|
|
|
+ case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder":
|
|
|
config.EncodeLevel = zapcore.LowercaseLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json" :
|
|
|
- config.EncodeLevel = zapcore.LowercaseLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console":
|
|
|
- config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json":
|
|
|
+ case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder":
|
|
|
config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console":
|
|
|
- config.EncodeLevel = zapcore.CapitalLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json":
|
|
|
+ case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder":
|
|
|
config.EncodeLevel = zapcore.CapitalLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console":
|
|
|
+ case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder":
|
|
|
config.EncodeLevel = zapcore.CapitalColorLevelEncoder
|
|
|
- case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json":
|
|
|
- config.EncodeLevel = zapcore.CapitalColorLevelEncoder
|
|
|
- default:
|
|
|
- config.EncodeLevel = zapcore.LowercaseLevelEncoder
|
|
|
}
|
|
|
return config
|
|
|
}
|