From 54f29e820e9844ab61cc5a317ebb079ac0bdcca1 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Wed, 27 Dec 2023 16:09:10 +0800 Subject: [PATCH] fix: fix the err not wrap --- internal/rpc/msg/seq.go | 4 ---- pkg/common/db/controller/msg.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/rpc/msg/seq.go b/internal/rpc/msg/seq.go index a01db2c86..c12f258b7 100644 --- a/internal/rpc/msg/seq.go +++ b/internal/rpc/msg/seq.go @@ -16,8 +16,6 @@ package msg import ( "context" - "github.com/OpenIMSDK/tools/log" - pbmsg "github.com/OpenIMSDK/protocol/msg" ) @@ -33,12 +31,10 @@ func (m *msgServer) GetConversationMaxSeq( } func (m *msgServer) GetMaxSeqs(ctx context.Context, req *pbmsg.GetMaxSeqsReq) (*pbmsg.SeqsInfoResp, error) { - log.ZDebug(ctx, "GetMaxSeqsServer", "seqs", req) maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, req.ConversationIDs) if err != nil { return nil, err } - log.ZDebug(ctx, "GetMaxSeqsServer", "maxSeqs", maxSeqs) return &pbmsg.SeqsInfoResp{MaxSeqs: maxSeqs}, nil } diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index a7230db00..a7a51b558 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -1063,7 +1063,7 @@ func (db *commonMsgDatabase) FindOneByDocIDs(ctx context.Context, conversationID docID := conversationID + ":" + fmt.Sprintf("%d", seq) msgs, err := db.msgDocDatabase.FindOneByDocID(ctx, docID) if err != nil { - return nil, err + return nil, errs.ErrRecordNotFound.Wrap(err.Error()) } totalMsgs[conversationID] = convert.MsgDB2Pb(msgs.Msg[index].Msg) }