From 22633cbe77a4d177696660d9f094c16f7e3634c1 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 17 Apr 2023 21:22:54 +0800 Subject: [PATCH] color --- pkg/common/log/color.go | 4 ++-- pkg/common/log/zap.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/common/log/color.go b/pkg/common/log/color.go index 692563f88..774f11133 100644 --- a/pkg/common/log/color.go +++ b/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())) } } diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 477fb03b3..08bcd7de4 100644 --- a/pkg/common/log/zap.go +++ b/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 }