From ae52f85502580f9dc4426ea8418c1a0f2df7bf82 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 11:24:27 +0800 Subject: [PATCH 1/4] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index e42bbf22a..5e0b9a520 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -108,7 +108,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { for _, v := range msgList { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { - log.NewWarn(triggerID, "msg come to storage center nil", v.String()) + log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) From 6ec65965a45ab0df3cf9262a935d246a41aa667f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 11:50:05 +0800 Subject: [PATCH 2/4] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 5e0b9a520..5c2668976 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -108,7 +108,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { for _, v := range msgList { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { - log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID) + log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID, msgChannelValue.userID) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) @@ -238,7 +238,10 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { if len(v) >= 0 { hashCode := getHashCode(userID) channelID := hashCode % ChannelNum - log.Debug(triggerID, "generate channelID", hashCode, channelID, userID) + log.Debug(triggerID, "generate channelID", hashCode, channelID, userID, len(v)) + for _, y := range v { + log.Debug(triggerID, "single user slice is ", y.String()) + } //go func(cID uint32, userID string, messages []*pbMsg.MsgDataToMQ) { och.chArrays[channelID] <- Cmd2Value{Cmd: UserMessages, Value: MsgChannelValue{userID: userID, msgList: v, triggerID: triggerID}} //}(channelID, userID, v) From 07b652c1d4ff94956844a9b77a123cf44c052517 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Jun 2022 12:08:53 +0800 Subject: [PATCH 3/4] singal offline push --- deploy_k8s/build_push_all_images.sh | 2 +- internal/push/logic/push_to_client.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index 756add942..b6333a8bd 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -3,7 +3,7 @@ source ./path_info.cfg # images version version=v2.0.10k - +git pull cd ../script/; ./build_all_service.sh cd ../deploy_k8s/ diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 90e56c1f7..da5e680ec 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -146,7 +146,7 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotificationBegin { req := &pbRtc.SignalReq{} if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { - return opts, err + return opts, utils.Wrap(err, "") } log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) switch req.Payload.(type) { From 95705cc95a69fa74189f4a76f12d2a872330f0ce Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 12:28:36 +0800 Subject: [PATCH 4/4] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 5c2668976..7baccf176 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -223,7 +223,7 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { log.Error(triggerID, "msg_transfer Unmarshal msg err", "msg", string(consumerMessages[i].Value), "err", err.Error()) return } - log.Debug(triggerID, "single msg come to distribution center", msgFromMQ.String(), string(consumerMessages[i].Key)) + log.Debug(triggerID, "single msg come to distribution center", string(consumerMessages[i].Key)) if oldM, ok := UserAggregationMsgs[string(consumerMessages[i].Key)]; ok { oldM = append(oldM, &msgFromMQ) UserAggregationMsgs[string(consumerMessages[i].Key)] = oldM @@ -233,7 +233,7 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { UserAggregationMsgs[string(consumerMessages[i].Key)] = m } } - log.Debug(triggerID, "generate map list users len", len(UserAggregationMsgs)) + log.Debug(triggerID, "generate map list users len", len(UserAggregationMsgs), UserAggregationMsgs) for userID, v := range UserAggregationMsgs { if len(v) >= 0 { hashCode := getHashCode(userID)