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

zap

Browse Source
This commit is contained in:
wangchuxiao 2023-04-17 20:58:21 +08:00
parent aed8536080
commit bbcc6c212a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,9 @@ func ZError(ctx context.Context, msg string, err error, keysAndValues ...interfa
} }
type ZapLogger struct { type ZapLogger struct {
zap *zap.SugaredLogger zap *zap.SugaredLogger
callerKey string
loggerKey string
} }
func NewZapLogger(logLevel int, isStdout bool, isJson bool, logLocation string, rotateCount uint) (*ZapLogger, error) { func NewZapLogger(logLevel int, isStdout bool, isJson bool, logLocation string, rotateCount uint) (*ZapLogger, error) {
@ -95,13 +97,17 @@ func (l *ZapLogger) cores(logLevel int, isStdout bool, isJson bool, logLocation
c.MessageKey = "msg" c.MessageKey = "msg"
c.LevelKey = "level" c.LevelKey = "level"
c.TimeKey = "time" c.TimeKey = "time"
c.CallerKey = "caller" l.callerKey = "caller"
l.loggerKey = "logger"
c.CallerKey = l.callerKey
l.loggerKey = c.NameKey
var fileEncoder zapcore.Encoder var fileEncoder zapcore.Encoder
if isJson { if isJson {
c.EncodeLevel = zapcore.CapitalLevelEncoder c.EncodeLevel = zapcore.CapitalLevelEncoder
fileEncoder = zapcore.NewJSONEncoder(c) fileEncoder = zapcore.NewJSONEncoder(c)
} else { } else {
c.EncodeLevel = zapcore.CapitalColorLevelEncoder c.EncodeLevel = l.CapitalColorLevelEncoder
customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) { customCallerEncoder := func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {
enc.AppendString("[" + caller.TrimmedPath() + "]") enc.AppendString("[" + caller.TrimmedPath() + "]")
} }
@ -143,7 +149,8 @@ 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) {
zapcore.CapitalColorLevelEncoder(level, enc) zapcore.CapitalColorLevelEncoder(level, enc)
enc.AppendString("caller") enc.AppendString(l.callerKey)
enc.AppendString(l.loggerKey)
} }
func (l *ZapLogger) ToZap() *zap.SugaredLogger { func (l *ZapLogger) ToZap() *zap.SugaredLogger {