From fb668b3f0ca0fedbfe516d43429bd0d230b41326 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 18 Apr 2023 10:37:12 +0800
Subject: [PATCH] color

---
 pkg/common/log/color.go | 10 +++++-----
 pkg/common/log/zap.go   | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkg/common/log/color.go b/pkg/common/log/color.go
index 774f11133..cd68ac519 100644
--- a/pkg/common/log/color.go
+++ b/pkg/common/log/color.go
@@ -28,16 +28,16 @@ var (
 		zapcore.PanicLevel:  Red,
 		zapcore.FatalLevel:  Red,
 	}
-	_unknownLevelColor = make(map[zapcore.Level][]string, len(_levelToColor))
+	_unknownLevelColor = make(map[zapcore.Level]string, len(_levelToColor))
 
-	_levelToLowercaseColorString = make(map[zapcore.Level][]string, len(_levelToColor))
-	_levelToCapitalColorString   = make(map[zapcore.Level][]string, len(_levelToColor))
+	_levelToLowercaseColorString = make(map[zapcore.Level]string, len(_levelToColor))
+	_levelToCapitalColorString   = make(map[zapcore.Level]string, len(_levelToColor))
 )
 
 func init() {
 	for level, color := range _levelToColor {
-		_levelToLowercaseColorString[level] = append(_levelToLowercaseColorString[level], color.Add(level.String()))
-		_levelToCapitalColorString[level] = append(_levelToCapitalColorString[level], color.Add(level.CapitalString()))
+		_levelToLowercaseColorString[level] = color.Add(level.String())
+		_levelToCapitalColorString[level] = color.Add(level.CapitalString())
 	}
 }
 
diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go
index 98e36228d..6f307fab1 100644
--- a/pkg/common/log/zap.go
+++ b/pkg/common/log/zap.go
@@ -113,8 +113,12 @@ func (l *ZapLogger) cores(isStdout bool, isJson bool, logLocation string, rotate
 		customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {
 			s := "[" + caller.TrimmedPath() + "]"
 			pid := fmt.Sprintf("["+"PID:"+"%d"+"]", os.Getpid())
-			enc.AppendString(_levelToColor[l.level].Add(s))
-			enc.AppendString(_levelToColor[l.level].Add(pid))
+			color, ok := _levelToColor[l.level]
+			if !ok {
+				color = _levelToColor[zapcore.ErrorLevel]
+			}
+			enc.AppendString(color.Add(s))
+			enc.AppendString(color.Add(pid))
 		}
 		c.EncodeCaller = customCallerEncoder
 		fileEncoder = zapcore.NewConsoleEncoder(c)
@@ -153,13 +157,12 @@ func (l *ZapLogger) getWriter(logLocation string, rorateCount uint) (zapcore.Wri
 }
 
 func (l *ZapLogger) CapitalColorLevelEncoder(level zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
-	ls, ok := _levelToCapitalColorString[level]
+	s, ok := _levelToCapitalColorString[level]
 	if !ok {
-		ls = _unknownLevelColor[zapcore.ErrorLevel]
-	}
-	for _, s := range ls {
-		enc.AppendString(s)
+		s = _unknownLevelColor[zapcore.ErrorLevel]
 	}
+
+	enc.AppendString(s)
 }
 
 func (l *ZapLogger) ToZap() *zap.SugaredLogger {