From 74ea7088932ba457a34144dbf4eaecf2e9bcda87 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 7 Jun 2023 15:06:50 +0800 Subject: [PATCH 1/5] conn --- internal/api/auth.go | 10 +++++----- internal/api/conversation.go | 10 +++++----- internal/api/friend.go | 10 +++++----- internal/api/group.go | 10 +++++----- internal/api/msg.go | 10 +++++----- internal/api/third.go | 10 +++++----- internal/api/user.go | 12 +++++------- 7 files changed, 35 insertions(+), 37 deletions(-) diff --git a/internal/api/auth.go b/internal/api/auth.go index bf6f3537b..6c3d51ccd 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -12,11 +12,11 @@ import ( ) func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry) *Auth { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImAuthName) - if err != nil { - // panic(err) - } - return &Auth{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImAuthName) + // if err != nil { + // panic(err) + // } + return &Auth{discov: discov} } type Auth struct { diff --git a/internal/api/conversation.go b/internal/api/conversation.go index 3a472976e..5fe55092c 100644 --- a/internal/api/conversation.go +++ b/internal/api/conversation.go @@ -12,11 +12,11 @@ import ( ) func NewConversation(discov discoveryregistry.SvcDiscoveryRegistry) *Conversation { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImConversationName) - if err != nil { - // panic(err) - } - return &Conversation{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImConversationName) + // if err != nil { + // panic(err) + // } + return &Conversation{discov: discov} } type Conversation struct { diff --git a/internal/api/friend.go b/internal/api/friend.go index a72781365..4bd8def1d 100644 --- a/internal/api/friend.go +++ b/internal/api/friend.go @@ -13,11 +13,11 @@ import ( ) func NewFriend(discov discoveryregistry.SvcDiscoveryRegistry) *Friend { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImFriendName) - if err != nil { - // panic(err) - } - return &Friend{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImFriendName) + // if err != nil { + // panic(err) + // } + return &Friend{discov: discov} } type Friend struct { diff --git a/internal/api/group.go b/internal/api/group.go index eb3d22c54..c8900289c 100644 --- a/internal/api/group.go +++ b/internal/api/group.go @@ -13,11 +13,11 @@ import ( ) func NewGroup(discov discoveryregistry.SvcDiscoveryRegistry) *Group { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImGroupName) - if err != nil { - // panic(err) - } - return &Group{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImGroupName) + // if err != nil { + // panic(err) + // } + return &Group{discov: discov} } type Group struct { diff --git a/internal/api/msg.go b/internal/api/msg.go index 8a0501d27..9d7cfc2a7 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -22,11 +22,11 @@ import ( ) func NewMsg(discov discoveryregistry.SvcDiscoveryRegistry) *Message { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImMsgName) - if err != nil { - // panic(err) - } - return &Message{conn: conn, validate: validator.New(), discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImMsgName) + // if err != nil { + // panic(err) + // } + return &Message{validate: validator.New(), discov: discov} } type Message struct { diff --git a/internal/api/third.go b/internal/api/third.go index b3c48142e..1b1496802 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -18,11 +18,11 @@ import ( ) func NewThird(discov discoveryregistry.SvcDiscoveryRegistry) *Third { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImThirdName) - if err != nil { - // panic(err) - } - return &Third{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImThirdName) + // if err != nil { + // panic(err) + // } + return &Third{discov: discov} } type Third struct { diff --git a/internal/api/user.go b/internal/api/user.go index 272121abb..ada759d39 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -5,7 +5,6 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp" "github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "google.golang.org/grpc" @@ -18,12 +17,11 @@ import ( ) func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImUserName) - if err != nil { - // panic(err) - } - log.ZInfo(context.Background(), "user rpc conn", "conn", conn) - return &User{conn: conn, discov: discov} + // conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImUserName) + // if err != nil { + // panic(err) + // } + return &User{discov: discov} } type User struct { From 73fc29f93aa5f20e25c688aff5ec68e95631cab8 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 7 Jun 2023 15:11:35 +0800 Subject: [PATCH 2/5] fix: rename fields --- internal/msggateway/n_ws_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index 6cd4930a1..4d425ac2a 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -150,7 +150,7 @@ func getRemoteAdders(client []*Client) string { if i == 0 { ret = c.ctx.GetRemoteAddr() } else { - ret += " @ " + c.ctx.GetRemoteAddr() + ret += "@" + c.ctx.GetRemoteAddr() } } return ret From b9ffab4a33a82f6c430348dcbec795c018cbdc3a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 7 Jun 2023 15:38:19 +0800 Subject: [PATCH 3/5] fix del bug --- pkg/common/db/controller/msg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 2f9301417..fa0f9dd5c 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -591,7 +591,7 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio if int64(len(msgDocModel.Msg)) > db.msg.GetSingleGocMsgNum() { log.ZWarn(ctx, "msgs too large", nil, "lenth", len(msgDocModel.Msg), "docID:", msgDocModel.DocID) } - if msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() && msgDocModel.IsFull() { + if msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() { delStruct.delDocIDs = append(delStruct.delDocIDs, msgDocModel.DocID) delStruct.minSeq = msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.Seq } else { From 36fee3f14a8fb962e639a1681750878c7a26f884 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 7 Jun 2023 15:54:23 +0800 Subject: [PATCH 4/5] clear msg tools --- internal/tools/msg.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/internal/tools/msg.go b/internal/tools/msg.go index a7d935af4..2b47560e5 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -77,7 +77,7 @@ func (c *MsgTool) ClearConversationsMsg(ctx context.Context, conversationIDs []s if err := c.msgDatabase.DeleteConversationMsgsAndSetMinSeq(ctx, conversationID, int64(config.Config.Mongo.DBRetainChatRecords*24*60*60)); err != nil { log.ZError(ctx, "DeleteUserSuperGroupMsgsAndSetMinSeq failed", err, "conversationID", conversationID, "DBRetainChatRecords", config.Config.Mongo.DBRetainChatRecords) } - if err := c.fixAndCheckSeq(ctx, conversationID); err != nil { + if err := c.checkMaxSeq(ctx, conversationID); err != nil { log.ZError(ctx, "fixSeq failed", err, "conversationID", conversationID) } @@ -95,20 +95,11 @@ func (c *MsgTool) checkMaxSeqWithMongo(ctx context.Context, conversationID strin return nil } -func (c *MsgTool) fixAndCheckSeq(ctx context.Context, conversationID string) error { +func (c *MsgTool) checkMaxSeq(ctx context.Context, conversationID string) error { maxSeq, err := c.msgDatabase.GetMaxSeq(ctx, conversationID) if err != nil { return err } - minSeq, err := c.msgDatabase.GetMinSeq(ctx, conversationID) - if err != nil { - return err - } - if minSeq > maxSeq { - if err = c.msgDatabase.SetMinSeq(ctx, conversationID, maxSeq); err != nil { - return err - } - } if err := c.checkMaxSeqWithMongo(ctx, conversationID, maxSeq); err != nil { return err } @@ -125,8 +116,8 @@ func (c *MsgTool) FixAllSeq(ctx context.Context) error { conversationIDs = append(conversationIDs, utils.GetNotificationConversationIDByConversationID(conversationID)) } for _, conversationID := range conversationIDs { - if err := c.fixAndCheckSeq(ctx, conversationID); err != nil { - log.ZError(ctx, "fixSeq failed", err, "conversationID", conversationID) + if err := c.checkMaxSeq(ctx, conversationID); err != nil { + log.ZWarn(ctx, "fixSeq failed", err, "conversationID", conversationID) } } fmt.Println("fix all seq finished") From 5b3c27046877189eb96a69c9000f952394227ded Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 7 Jun 2023 16:35:39 +0800 Subject: [PATCH 5/5] del logs --- pkg/common/db/controller/msg.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index fa0f9dd5c..7e844128d 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -543,6 +543,7 @@ func (db *commonMsgDatabase) DeleteConversationMsgsAndSetMinSeq(ctx context.Cont if err != nil { return err } + log.ZInfo(ctx, "DeleteConversationMsgsAndSetMinSeq", "conversationID", conversationID, "minSeq", minSeq) if minSeq == 0 { return nil } @@ -592,6 +593,7 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio log.ZWarn(ctx, "msgs too large", nil, "lenth", len(msgDocModel.Msg), "docID:", msgDocModel.DocID) } if msgDocModel.IsFull() && msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.SendTime+(remainTime*1000) < utils.GetCurrentTimestampByMill() { + log.ZDebug(ctx, "doc is full and all msg is expired", "docID", msgDocModel.DocID) delStruct.delDocIDs = append(delStruct.delDocIDs, msgDocModel.DocID) delStruct.minSeq = msgDocModel.Msg[len(msgDocModel.Msg)-1].Msg.Seq } else { @@ -604,10 +606,14 @@ func (db *commonMsgDatabase) deleteMsgRecursion(ctx context.Context, conversatio hasMarkDelFlag = true } else { // 到本条消息不需要删除, minSeq置为这条消息的seq + if len(delStruct.delDocIDs) > 0 { + log.ZDebug(ctx, "delete docs", "delDocIDs", delStruct.delDocIDs) + } if err := db.msgDocDatabase.DeleteDocs(ctx, delStruct.delDocIDs); err != nil { return 0, err } if hasMarkDelFlag { + log.ZDebug(ctx, "delete msg by index", "delMsgIndexs", delMsgIndexs, "docID", msgDocModel.DocID) // mark del all delMsgIndexs if err := db.msgDocDatabase.DeleteMsgsInOneDocByIndex(ctx, msgDocModel.DocID, delMsgIndexs); err != nil { return delStruct.getSetMinSeq(), err