blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

color

Browse Source
This commit is contained in:
wangchuxiao 2023-04-18 10:37:12 +08:00
parent c04b85aa29
commit fb668b3f0c
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/common/log/color.go
View File

@ -28,16 +28,16 @@ var (
zapcore.PanicLevel: Red, zapcore.PanicLevel: Red,
zapcore.FatalLevel: 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)) _levelToLowercaseColorString = make(map[zapcore.Level]string, len(_levelToColor))
_levelToCapitalColorString = make(map[zapcore.Level][]string, len(_levelToColor)) _levelToCapitalColorString = make(map[zapcore.Level]string, len(_levelToColor))
) )
func init() { func init() {
for level, color := range _levelToColor { for level, color := range _levelToColor {
_levelToLowercaseColorString[level] = append(_levelToLowercaseColorString[level], color.Add(level.String())) _levelToLowercaseColorString[level] = color.Add(level.String())
_levelToCapitalColorString[level] = append(_levelToCapitalColorString[level], color.Add(level.CapitalString())) _levelToCapitalColorString[level] = color.Add(level.CapitalString())
} }
} }

17
pkg/common/log/zap.go
View File

@ -113,8 +113,12 @@ func (l *ZapLogger) cores(isStdout bool, isJson bool, logLocation string, rotate
customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) { customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {
s := "[" + caller.TrimmedPath() + "]" s := "[" + caller.TrimmedPath() + "]"
pid := fmt.Sprintf("["+"PID:"+"%d"+"]", os.Getpid()) pid := fmt.Sprintf("["+"PID:"+"%d"+"]", os.Getpid())
enc.AppendString(_levelToColor[l.level].Add(s)) color, ok := _levelToColor[l.level]
enc.AppendString(_levelToColor[l.level].Add(pid)) if !ok {
color = _levelToColor[zapcore.ErrorLevel]
}
enc.AppendString(color.Add(s))
enc.AppendString(color.Add(pid))
} }
c.EncodeCaller = customCallerEncoder c.EncodeCaller = customCallerEncoder
fileEncoder = zapcore.NewConsoleEncoder(c) 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) { func (l *ZapLogger) CapitalColorLevelEncoder(level zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
ls, ok := _levelToCapitalColorString[level] s, ok := _levelToCapitalColorString[level]
if !ok { if !ok {
ls = _unknownLevelColor[zapcore.ErrorLevel] s = _unknownLevelColor[zapcore.ErrorLevel]
}
for _, s := range ls {
enc.AppendString(s)
} }
enc.AppendString(s)
} }
func (l *ZapLogger) ToZap() *zap.SugaredLogger { func (l *ZapLogger) ToZap() *zap.SugaredLogger {