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:
skiffer-git 2022-06-11 10:42:26 +08:00
parent f232ffb5cc
commit 9216a085cf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/msg_gateway/gate/batch_push.go
View File

@ -46,15 +46,18 @@ func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData
func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformID int) []*sdk_ws.MsgData { func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformID int) []*sdk_ws.MsgData {
userConn := ws.getUserConn(pushToUserID, platformID) userConn := ws.getUserConn(pushToUserID, platformID)
if userConn == nil { if userConn == nil {
log.Debug(operationID, "userConn == nil")
return []*sdk_ws.MsgData{msgData} return []*sdk_ws.MsgData{msgData}
} }
if msgData.Seq <= userConn.PushedMaxSeq { if msgData.Seq <= userConn.PushedMaxSeq {
log.Debug(operationID, "msgData.Seq <= userConn.PushedMaxSeq", msgData.Seq, userConn.PushedMaxSeq)
return nil return nil
} }
msgList := r.GetSingleUserMsg(operationID, msgData.Seq, pushToUserID) msgList := r.GetSingleUserMsg(operationID, msgData.Seq, pushToUserID)
if msgList == nil { if msgList == nil {
log.Debug(operationID, "GetSingleUserMsg msgList == nil", msgData.Seq, userConn.PushedMaxSeq)
userConn.PushedMaxSeq = msgData.Seq userConn.PushedMaxSeq = msgData.Seq
return []*sdk_ws.MsgData{msgData} return []*sdk_ws.MsgData{msgData}
} }
@ -65,6 +68,7 @@ func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.
userConn.PushedMaxSeq = v.Seq userConn.PushedMaxSeq = v.Seq
} }
} }
log.Debug(operationID, "GetSingleUserMsg msgList len ", len(msgList), userConn.PushedMaxSeq)
return msgList return msgList
} }

4
internal/msg_gateway/gate/rpc_server.go
View File

@ -207,10 +207,10 @@ func (r *RPCServer) OnlineBatchPushOneMsg(_ context.Context, req *pbRelay.Online
} }
log.Debug(req.OperationID, "GetSingleUserMsgForPushPlatforms begin", req.MsgData.Seq, v, platformList) log.Debug(req.OperationID, "GetSingleUserMsgForPushPlatforms begin", req.MsgData.Seq, v, platformList)
needPushMapList := r.GetSingleUserMsgForPushPlatforms(req.OperationID, req.MsgData, v, platformList) needPushMapList := r.GetSingleUserMsgForPushPlatforms(req.OperationID, req.MsgData, v, platformList)
log.Debug(req.OperationID, "GetSingleUserMsgForPushPlatforms ", req.MsgData.Seq, v, platformList, len(needPushMapList)) log.Debug(req.OperationID, "GetSingleUserMsgForPushPlatforms end", req.MsgData.Seq, v, platformList, len(needPushMapList))
for platform, list := range needPushMapList { for platform, list := range needPushMapList {
if list != nil { if list != nil {
log.Debug(req.OperationID, "GetSingleUserMsgForPushPlatforms ", "userID: ", v, "platform: ", platform, "push msg num:", len(list)) log.Debug(req.OperationID, "needPushMapList ", "userID: ", v, "platform: ", platform, "push msg num:", len(list))
for _, v := range list { for _, v := range list {
req.MsgData.MsgDataList = append(req.MsgData.MsgDataList, v) req.MsgData.MsgDataList = append(req.MsgData.MsgDataList, v)
} }