From 120101fdccb15f81344050de08df54cdc4e1f670 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 15 Jun 2023 15:13:45 +0800 Subject: [PATCH 1/2] fix: zap log panic --- pkg/common/log/zap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 389ebc4e8..e6fc8fae8 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -208,7 +208,7 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal if err != nil { keysAndValues = append(keysAndValues, "error", err.Error()) } - keysAndValues = append([]interface{}{constant.OperationID, mcontext.GetOperationID(ctx)}, keysAndValues...) + keysAndValues = l.kvAppend(ctx, keysAndValues) l.zap.Errorw(msg, keysAndValues...) } From e3615c6c9903586b0f0f719e1881c56daabcc89b Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 15 Jun 2023 17:42:33 +0800 Subject: [PATCH 2/2] test: log --- pkg/common/db/controller/msg.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 4cb1f0580..2f991f9ea 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -475,6 +475,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin if err != nil && errs.Unwrap(err) != redis.Nil { return 0, 0, nil, err } + log.ZDebug(ctx, "GetMsgBySeqsRange", "userMinSeq", userMinSeq, "conMinSeq", minSeq, "conMaxSeq", maxSeq, "userMaxSeq", userMaxSeq) if userMaxSeq != 0 { if userMaxSeq < maxSeq { maxSeq = userMaxSeq