color

pkg/common/log/color.go

@@ -36,8 +36,8 @@ var (
 
 func init() {
 	for level, color := range _levelToColor {
-		_levelToLowercaseColorString[level] = append(_levelToLowercaseColorString[level], color.Add(level.String()), color.Add("caller"))
-		_levelToCapitalColorString[level] = append(_levelToCapitalColorString[level], color.Add(level.CapitalString()), color.Add("caller"))
+		_levelToLowercaseColorString[level] = append(_levelToLowercaseColorString[level], color.Add(level.String()))
+		_levelToCapitalColorString[level] = append(_levelToCapitalColorString[level], color.Add(level.CapitalString()))
 	}
 }
 

pkg/common/log/zap.go

@@ -150,7 +150,7 @@ func (l *ZapLogger) getWriter(logLocation string, rorateCount uint) (zapcore.Wri
 func (l *ZapLogger) CapitalColorLevelEncoder(level zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
 	ls, ok := _levelToCapitalColorString[level]
 	if !ok {
-		ls = _levelToCapitalColorString[zapcore.ErrorLevel]
+		ls = _unknownLevelColor[zapcore.ErrorLevel]
 	}
 	for _, s := range ls {
 		enc.AppendString(s)
@@ -223,7 +223,7 @@ func (l *ZapLogger) WithValues(keysAndValues ...interface{}) Logger {
 
 func (l *ZapLogger) WithName(name string) Logger {
 	dup := *l
-	dup.zap = l.zap.Named(name)
+	dup.zap = l.zap.Named(_levelToColor[l.zap.Level()].Add(name))
 	return &dup
 }