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

log

Browse Source
This commit is contained in:
wangchuxiao 2023-05-11 20:02:21 +08:00
parent 52b079a582
commit 945b638d4d
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/a2r/api2rpc.go
View File

@ -15,7 +15,6 @@ func Call[A, B, C any](
client func(ctx context.Context) (C, error), client func(ctx context.Context) (C, error),
c *gin.Context, c *gin.Context,
) { ) {
log.ZDebug(c, "before bind")
var req A var req A
if err := c.BindJSON(&req); err != nil { if err := c.BindJSON(&req); err != nil {
log.ZWarn(c, "gin bind json error", err, "req", req) log.ZWarn(c, "gin bind json error", err, "req", req)
@ -29,14 +28,12 @@ func Call[A, B, C any](
return return
} }
} }
log.ZDebug(c, "before get grpc conn")
cli, err := client(c) cli, err := client(c)
if err != nil { if err != nil {
log.ZError(c, "get conn error", err, "req", req) log.ZError(c, "get conn error", err, "req", req)
apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败 apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return return
} }
log.ZDebug(c, "before call rpc")
data, err := rpc(cli, c, &req) data, err := rpc(cli, c, &req)
if err != nil { if err != nil {
log.ZError(c, "rpc call error", err, "req", req) log.ZError(c, "rpc call error", err, "req", req)

1
pkg/common/db/cache/msg.go vendored
View File

@ -268,7 +268,6 @@ func (c *msgCache) GetMessagesBySeq(ctx context.Context, conversationID string,
for i, v := range result { for i, v := range result {
cmd := v.(*redis.StringCmd) cmd := v.(*redis.StringCmd)
if cmd.Err() != nil { if cmd.Err() != nil {
log.ZWarn(ctx, "get msg from cache failed", cmd.Err(), "cmd", cmd.Val())
failedSeqs = append(failedSeqs, seqs[i]) failedSeqs = append(failedSeqs, seqs[i])
} else { } else {
msg := sdkws.MsgData{} msg := sdkws.MsgData{}

3
pkg/common/db/controller/common_msg.go
View File

@ -519,6 +519,9 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, conversation
log.ZError(ctx, "get message from redis exception", err, conversationID, seqs) log.ZError(ctx, "get message from redis exception", err, conversationID, seqs)
} }
} }
if len(failedSeqs) != 0 {
log.ZDebug(ctx, "get message from redis failed", err, "seqs", seqs)
}
// get from cache or db // get from cache or db
prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs)) prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))
if len(failedSeqs) > 0 { if len(failedSeqs) > 0 {

7
pkg/common/db/unrelation/msg.go
View File

@ -154,11 +154,6 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(ctx context.Context, docID strin
if err != nil { if err != nil {
return nil, nil, errs.Wrap(err) return nil, nil, errs.Wrap(err)
} }
// result, err := m.MsgCollection.Find(ctx, bson.M{"doc_id": docID, "msgs": bson.M{"$slice": []int64{beginIndex, num}}})
// if err != nil {
// return nil, nil, err
// }
var msgInfos []table.MsgInfoModel var msgInfos []table.MsgInfoModel
if err := cursor.All(ctx, &msgInfos); err != nil { if err := cursor.All(ctx, &msgInfos); err != nil {
return nil, nil, err return nil, nil, err
@ -166,12 +161,14 @@ func (m *MsgMongoDriver) GetMsgBySeqIndexIn1Doc(ctx context.Context, docID strin
if len(msgInfos) < 1 { if len(msgInfos) < 1 {
return nil, nil, errs.ErrRecordNotFound.Wrap("mongo GetMsgBySeqIndex failed, len is 0") return nil, nil, errs.ErrRecordNotFound.Wrap("mongo GetMsgBySeqIndex failed, len is 0")
} }
log.ZDebug(ctx, "msgInfos", "num", len(msgInfos))
for _, v := range msgInfos { for _, v := range msgInfos {
var msg sdkws.MsgData var msg sdkws.MsgData
if err := proto.Unmarshal(v.Msg, &msg); err != nil { if err := proto.Unmarshal(v.Msg, &msg); err != nil {
return nil, nil, err return nil, nil, err
} }
if msg.Seq >= beginSeq && msg.Seq <= endSeq { if msg.Seq >= beginSeq && msg.Seq <= endSeq {
log.ZDebug(ctx, "find msg", "msg", &msg)
msgs = append(msgs, &msg) msgs = append(msgs, &msg)
seqs = append(seqs, msg.Seq) seqs = append(seqs, msg.Seq)
} else { } else {