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

persistent message modify

Browse Source
This commit is contained in:
Gordon 2021-07-06 20:04:57 +08:00
parent e74e963b8a
commit 205229ee60
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/open_im_api.go
View File

@ -24,7 +24,8 @@ func main() {
return return
} }
syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd())) syscall.Dup2(int(logFile.Fd()), int(os.Stderr.Fd()))
//gin.SetMode(gin.ReleaseMode)
//gin.DefaultWriter = ioutil.Discard
log.Info("", "", "api server running...") log.Info("", "", "api server running...")
r := gin.Default() r := gin.Default()
r.Use(utils.CorsHandler()) r.Use(utils.CorsHandler())

1
src/common/log/logrus.go
View File

@ -62,7 +62,6 @@ func NewLfsHook(rotationTime time.Duration, maxRemainNum uint, moduleName string
HideKeys: false, HideKeys: false,
FieldsOrder: []string{"PID"}, FieldsOrder: []string{"PID"},
}) })
return lfsHook return lfsHook
} }
func initRotateLogs(rotationTime time.Duration, maxRemainNum uint, level string, moduleName string) *rotatelogs.RotateLogs { func initRotateLogs(rotationTime time.Duration, maxRemainNum uint, level string, moduleName string) *rotatelogs.RotateLogs {

23
src/msg_transfer/logic/persistent_msg_handler.go
View File

@ -8,6 +8,7 @@ package logic
import ( import (
"Open_IM/src/common/config" "Open_IM/src/common/config"
"Open_IM/src/common/constant"
"Open_IM/src/common/db/mysql_model/im_mysql_msg_model" "Open_IM/src/common/db/mysql_model/im_mysql_msg_model"
kfk "Open_IM/src/common/kafka" kfk "Open_IM/src/common/kafka"
"Open_IM/src/common/log" "Open_IM/src/common/log"
@ -15,6 +16,7 @@ import (
"Open_IM/src/utils" "Open_IM/src/utils"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"strings"
) )
type PersistentConsumerHandler struct { type PersistentConsumerHandler struct {
@ -42,14 +44,23 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(msg []byte, msgKey strin
//Control whether to store history messages (mysql) //Control whether to store history messages (mysql)
isPersist := utils.GetSwitchFromOptions(Options, "persistent") isPersist := utils.GetSwitchFromOptions(Options, "persistent")
//Only process receiver data //Only process receiver data
if isPersist && msgKey == pbData.RecvID { if isPersist {
log.InfoByKv("msg_transfer chat persisting", pbData.OperationID) if msgKey == pbData.RecvID && pbData.SessionType == constant.SingleChatType {
if err = im_mysql_msg_model.InsertMessageToChatLog(pbData); err != nil { log.InfoByKv("msg_transfer chat persisting", pbData.OperationID)
log.ErrorByKv("Message insert failed", pbData.OperationID, "err", err.Error(), "chat", pbData.String()) if err = im_mysql_msg_model.InsertMessageToChatLog(pbData); err != nil {
return log.ErrorByKv("Message insert failed", pbData.OperationID, "err", err.Error(), "chat", pbData.String())
return
}
} else if pbData.SessionType == constant.GroupChatType && msgKey == "0" {
pbData.RecvID = strings.Split(pbData.RecvID, " ")[1]
log.InfoByKv("msg_transfer chat persisting", pbData.OperationID)
if err = im_mysql_msg_model.InsertMessageToChatLog(pbData); err != nil {
log.ErrorByKv("Message insert failed", pbData.OperationID, "err", err.Error(), "chat", pbData.String())
return
}
} }
}
}
} }
func (PersistentConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error { return nil } func (PersistentConsumerHandler) Setup(_ sarama.ConsumerGroupSession) error { return nil }
func (PersistentConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil } func (PersistentConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return nil }

4
src/push/logic/push_to_client.go
View File

@ -131,9 +131,9 @@ func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) {
return return
} }
groupID := m.RecvID groupID := m.RecvID
for _, v := range reply.MemberList { for i, v := range reply.MemberList {
m.RecvID = v.UserId + " " + groupID m.RecvID = v.UserId + " " + groupID
sendMsgToKafka(m, m.RecvID, "msgKey--recvID+\" \"+groupID") sendMsgToKafka(m, utils.IntToString(i), "msgKey--recvID+\" \"+groupID")
} }
default: default:

4
src/rpc/chat/chat/send_msg.go
View File

@ -111,9 +111,9 @@ func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*
return returnMsg(&replay, pb, reply.ErrorCode, reply.ErrorMsg, "", 0) return returnMsg(&replay, pb, reply.ErrorCode, reply.ErrorMsg, "", 0)
} }
groupID := pbData.RecvID groupID := pbData.RecvID
for _, v := range reply.MemberList { for i, v := range reply.MemberList {
pbData.RecvID = v.UserId + " " + groupID pbData.RecvID = v.UserId + " " + groupID
rpc.sendMsgToKafka(&pbData, pbData.RecvID) rpc.sendMsgToKafka(&pbData, utils.IntToString(i))
} }
return returnMsg(&replay, pb, 0, "", serverMsgID, pbData.SendTime) return returnMsg(&replay, pb, 0, "", serverMsgID, pbData.SendTime)
default: default: