msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

msg status

Browse Source
test-errcode
withchao 3 years ago
parent 217d6380f7
commit 52e393dc45
5 changed files with 65 additions and 75 deletions
Show Stats Download Patch File Download Diff File

38
internal/rpc/msg/msg_status.go
Unescape View File

@ -1,46 +1,24 @@
package msg package msg
import ( import (
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/tracelog"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/log"
pbMsg "Open_IM/pkg/proto/msg" pbMsg "Open_IM/pkg/proto/msg"
"Open_IM/pkg/utils"
"context" "context"
goRedis "github.com/go-redis/redis/v8"
) )
func (rpc *msgServer) SetSendMsgStatus(_ context.Context, req *pbMsg.SetSendMsgStatusReq) (resp *pbMsg.SetSendMsgStatusResp, err error) { func (s *msgServer) SetSendMsgStatus(ctx context.Context, req *pbMsg.SetSendMsgStatusReq) (*pbMsg.SetSendMsgStatusResp, error) {
resp = &pbMsg.SetSendMsgStatusResp{} resp := &pbMsg.SetSendMsgStatusResp{}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) if err := s.MsgInterface.SetSendMsgStatus(ctx, tracelog.GetOperationID(ctx), req.Status); err != nil {
if err := db.DB.SetSendMsgStatus(req.Status, req.OperationID); err != nil { return nil, err
log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
resp.ErrCode = constant.ErrDatabase.ErrCode
resp.ErrMsg = err.Error()
return resp, nil
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
return resp, nil return resp, nil
} }
func (rpc *msgServer) GetSendMsgStatus(_ context.Context, req *pbMsg.GetSendMsgStatusReq) (resp *pbMsg.GetSendMsgStatusResp, err error) { func (s *msgServer) GetSendMsgStatus(ctx context.Context, req *pbMsg.GetSendMsgStatusReq) (resp *pbMsg.GetSendMsgStatusResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
resp = &pbMsg.GetSendMsgStatusResp{} resp = &pbMsg.GetSendMsgStatusResp{}
status, err := db.DB.GetSendMsgStatus(req.OperationID) resp.Status, err = s.MsgInterface.GetSendMsgStatus(ctx, tracelog.GetOperationID(ctx))
if err != nil { if err != nil {
resp.Status = constant.MsgStatusNotExist return nil, err
if err == goRedis.Nil {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.OperationID, "not exist")
return resp, nil
} else {
log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
resp.ErrMsg = err.Error()
resp.ErrCode = constant.ErrDB.ErrCode
return resp, nil
}
} }
resp.Status = int32(status)
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
return resp, nil return resp, nil
} }

80
internal/rpc/msg/query_msg.go
Unescape View File

@ -1,47 +1,37 @@
package msg package msg
import ( //func (rpc *msgServer) GetSuperGroupMsg(context context.Context, req *msg.GetSuperGroupMsgReq) (*msg.GetSuperGroupMsgResp, error) {
commonDB "Open_IM/pkg/common/db" // log.Debug(req.OperationID, utils.GetSelfFuncName(), req.String())
"Open_IM/pkg/common/log" // resp := new(msg.GetSuperGroupMsgResp)
promePkg "Open_IM/pkg/common/prometheus" // redisMsgList, failedSeqList, err := commonDB.DB.GetMessageListBySeq(req.GroupID, []uint32{req.Seq}, req.OperationID)
"Open_IM/pkg/proto/msg" // if err != nil {
"Open_IM/pkg/utils" // if err != go_redis.Nil {
"context" // promePkg.PromeAdd(promePkg.MsgPullFromRedisFailedCounter, len(failedSeqList))
go_redis "github.com/go-redis/redis/v8" // log.Error(req.OperationID, "get message from redis exception", err.Error(), failedSeqList)
) // } else {
// log.Debug(req.OperationID, "get message from redis is nil", failedSeqList)
func (rpc *msgServer) GetSuperGroupMsg(context context.Context, req *msg.GetSuperGroupMsgReq) (*msg.GetSuperGroupMsgResp, error) { // }
log.Debug(req.OperationID, utils.GetSelfFuncName(), req.String()) // msgList, err1 := commonDB.DB.GetSuperGroupMsgBySeqListMongo(req.GroupID, failedSeqList, req.OperationID)
resp := new(msg.GetSuperGroupMsgResp) // if err1 != nil {
redisMsgList, failedSeqList, err := commonDB.DB.GetMessageListBySeq(req.GroupID, []uint32{req.Seq}, req.OperationID) // promePkg.PromeAdd(promePkg.MsgPullFromMongoFailedCounter, len(failedSeqList))
if err != nil { // log.Error(req.OperationID, "GetSuperGroupMsg data error", req.String(), err.Error())
if err != go_redis.Nil { // resp.ErrCode = 201
promePkg.PromeAdd(promePkg.MsgPullFromRedisFailedCounter, len(failedSeqList)) // resp.ErrMsg = err.Error()
log.Error(req.OperationID, "get message from redis exception", err.Error(), failedSeqList) // return resp, nil
} else { // } else {
log.Debug(req.OperationID, "get message from redis is nil", failedSeqList) // promePkg.PromeAdd(promePkg.MsgPullFromMongoSuccessCounter, len(msgList))
} // redisMsgList = append(redisMsgList, msgList...)
msgList, err1 := commonDB.DB.GetSuperGroupMsgBySeqListMongo(req.GroupID, failedSeqList, req.OperationID) // for _, m := range msgList {
if err1 != nil { // resp.MsgData = m
promePkg.PromeAdd(promePkg.MsgPullFromMongoFailedCounter, len(failedSeqList)) // }
log.Error(req.OperationID, "GetSuperGroupMsg data error", req.String(), err.Error()) //
resp.ErrCode = 201 // }
resp.ErrMsg = err.Error() // } else {
return resp, nil // promePkg.PromeAdd(promePkg.MsgPullFromRedisSuccessCounter, len(redisMsgList))
} else { // for _, m := range redisMsgList {
promePkg.PromeAdd(promePkg.MsgPullFromMongoSuccessCounter, len(msgList)) // resp.MsgData = m
redisMsgList = append(redisMsgList, msgList...) // }
for _, m := range msgList { // }
resp.MsgData = m // log.Debug(req.OperationID, utils.GetSelfFuncName(), resp.String())
} // return resp, nil
//}
}
} else {
promePkg.PromeAdd(promePkg.MsgPullFromRedisSuccessCounter, len(redisMsgList))
for _, m := range redisMsgList {
resp.MsgData = m
}
}
log.Debug(req.OperationID, utils.GetSelfFuncName(), resp.String())
return resp, nil
}

2
internal/rpc/msg/server.go
Unescape View File

@ -5,6 +5,7 @@ import (
"Open_IM/internal/common/rpcserver" "Open_IM/internal/common/rpcserver"
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/controller"
"Open_IM/pkg/common/kafka" "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
@ -23,6 +24,7 @@ import (
type msgServer struct { type msgServer struct {
*rpcserver.RpcServer *rpcserver.RpcServer
MsgInterface controller.MsgInterface
} }
type deleteMsg struct { type deleteMsg struct {

16
internal/rpc/msg/utils.go
Unescape View File

@ -0,0 +1,16 @@
package msg
import (
"Open_IM/pkg/utils"
"github.com/go-redis/redis/v8"
"gorm.io/gorm"
)
func IsNotFound(err error) bool {
switch utils.Unwrap(err) {
case gorm.ErrRecordNotFound, redis.Nil:
return true
default:
return false
}
}

4
pkg/common/db/controller/msg.go
Unescape View File

@ -18,6 +18,10 @@ type MsgInterface interface {
DelMsgLogic(ctx context.Context, userID string, seqList []uint32) error DelMsgLogic(ctx context.Context, userID string, seqList []uint32) error
DelMsgBySeqListInOneDoc(ctx context.Context, docID string, seqList []uint32) (unExistSeqList []uint32, err error) DelMsgBySeqListInOneDoc(ctx context.Context, docID string, seqList []uint32) (unExistSeqList []uint32, err error)
ReplaceMsgToBlankByIndex(docID string, index int) (replaceMaxSeq uint32, err error) ReplaceMsgToBlankByIndex(docID string, index int) (replaceMaxSeq uint32, err error)
// status
SetSendMsgStatus(ctx context.Context, id string, status int32) error
GetSendMsgStatus(ctx context.Context, id string) (int32, error) // 不存在返回 constant.MsgStatusNotExist
} }
type MsgDatabaseInterface interface { type MsgDatabaseInterface interface {

Write Preview
Loading…
Cancel
Save