Merge remote-tracking branch 'origin/tuoyun' into tuoyun

# Conflicts:
#	internal/msg_transfer/logic/online_history_msg_handler.go
This commit is contained in:
Gordon 2022-05-21 15:04:19 +08:00
commit be3d2b6552

View File

@ -373,7 +373,7 @@ func (rpc *rpcChat) sendMsgToKafka(m *pbChat.MsgDataToMQ, key string, status str
if err != nil {
log.Error(m.OperationID, "kafka send failed", "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), "key", key, status)
} else {
log.NewWarn(m.OperationID, "sendMsgToKafka client msgID ", m.MsgData.ClientMsgID)
// log.NewWarn(m.OperationID, "sendMsgToKafka client msgID ", m.MsgData.ClientMsgID)
}
return err
case constant.OfflineStatus: