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

group rpc

Browse Source
test-errcode
wangchuxiao 3 years ago
parent 5f48eeb74b
commit 6e8a2232a9
4 changed files with 498 additions and 990 deletions
Show Stats Download Patch File Download Diff File

122
internal/rpc/cache/cache.go vendored
Unescape View File

@ -6,10 +6,12 @@ import (
rocksCache "Open_IM/pkg/common/db/rocks_cache" rocksCache "Open_IM/pkg/common/db/rocks_cache"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
promePkg "Open_IM/pkg/common/prometheus" promePkg "Open_IM/pkg/common/prometheus"
"Open_IM/pkg/grpc-etcdv3/getcdv3" "Open_IM/pkg/common/trace_log"
pbCache "Open_IM/pkg/proto/cache" pbCache "Open_IM/pkg/proto/cache"
sdkws "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"context" "context"
"github.com/OpenIMSDK/getcdv3"
"net" "net"
"strconv" "strconv"
"strings" "strings"
@ -75,7 +77,7 @@ func (s *cacheServer) Run() {
} }
} }
log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) log.NewInfo("", "rpcRegisterIP", rpcRegisterIP)
err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10, "")
if err != nil { if err != nil {
log.NewError("0", "RegisterEtcd failed ", err.Error()) log.NewError("0", "RegisterEtcd failed ", err.Error())
panic(utils.Wrap(err, "register cache module rpc to etcd err")) panic(utils.Wrap(err, "register cache module rpc to etcd err"))
@ -89,91 +91,97 @@ func (s *cacheServer) Run() {
log.NewInfo("0", "message cms rpc success") log.NewInfo("0", "message cms rpc success")
} }
func (s *cacheServer) GetFriendIDListFromCache(_ context.Context, req *pbCache.GetFriendIDListFromCacheReq) (resp *pbCache.GetFriendIDListFromCacheResp, err error) { func (s *cacheServer) GetFriendIDListFromCache(ctx context.Context, req *pbCache.GetFriendIDListFromCacheReq) (resp *pbCache.GetFriendIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbCache.GetFriendIDListFromCacheResp{CommonResp: &sdkws.CommonResp{}}
resp = &pbCache.GetFriendIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
friendIDList, err := rocksCache.GetFriendIDListFromCache(req.UserID) defer func() {
trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
trace_log.ShowLog(ctx)
}()
friendIDList, err := rocksCache.GetFriendIDListFromCache(ctx, req.UserID)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetFriendIDListFromCache", err.Error()) constant.SetErrorForResp(err, resp.CommonResp)
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode return
resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
return resp, nil
} }
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), friendIDList)
resp.UserIDList = friendIDList resp.UserIDList = friendIDList
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return
return resp, nil
} }
// this is for dtm call // this is for dtm call
func (s *cacheServer) DelFriendIDListFromCache(_ context.Context, req *pbCache.DelFriendIDListFromCacheReq) (resp *pbCache.DelFriendIDListFromCacheResp, err error) { func (s *cacheServer) DelFriendIDListFromCache(ctx context.Context, req *pbCache.DelFriendIDListFromCacheReq) (resp *pbCache.DelFriendIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbCache.DelFriendIDListFromCacheResp{CommonResp: &sdkws.CommonResp{}}
resp = &pbCache.DelFriendIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
if err := rocksCache.DelFriendIDListFromCache(req.UserID); err != nil { defer func() {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.UserID, err.Error()) trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode trace_log.ShowLog(ctx)
resp.CommonResp.ErrMsg = err.Error() }()
return resp, nil if err := rocksCache.DelFriendIDListFromCache(ctx, req.UserID); err != nil {
constant.SetErrorForResp(err, resp.CommonResp)
return
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
return resp, nil return
} }
func (s *cacheServer) GetBlackIDListFromCache(_ context.Context, req *pbCache.GetBlackIDListFromCacheReq) (resp *pbCache.GetBlackIDListFromCacheResp, err error) { func (s *cacheServer) GetBlackIDListFromCache(ctx context.Context, req *pbCache.GetBlackIDListFromCacheReq) (resp *pbCache.GetBlackIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbCache.GetBlackIDListFromCacheResp{CommonResp: &sdkws.CommonResp{}}
resp = &pbCache.GetBlackIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
blackUserIDList, err := rocksCache.GetBlackListFromCache(req.UserID) defer func() {
trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
trace_log.ShowLog(ctx)
}()
blackUserIDList, err := rocksCache.GetBlackListFromCache(ctx, req.UserID)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "AddFriendToCache failed", err.Error()) constant.SetErrorForResp(err, resp.CommonResp)
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode return
resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
return resp, nil
} }
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), blackUserIDList)
resp.UserIDList = blackUserIDList resp.UserIDList = blackUserIDList
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return
return resp, nil
} }
func (s *cacheServer) DelBlackIDListFromCache(_ context.Context, req *pbCache.DelBlackIDListFromCacheReq) (resp *pbCache.DelBlackIDListFromCacheResp, err error) { func (s *cacheServer) DelBlackIDListFromCache(ctx context.Context, req *pbCache.DelBlackIDListFromCacheReq) (resp *pbCache.DelBlackIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbCache.DelBlackIDListFromCacheResp{CommonResp: &sdkws.CommonResp{}}
resp = &pbCache.DelBlackIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
if err := rocksCache.DelBlackIDListFromCache(req.UserID); err != nil { defer func() {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.UserID, err.Error()) trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode trace_log.ShowLog(ctx)
resp.CommonResp.ErrMsg = err.Error() }()
return resp, nil if err := rocksCache.DelBlackIDListFromCache(ctx, req.UserID); err != nil {
constant.SetErrorForResp(err, resp.CommonResp)
return
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
return resp, nil return resp, nil
} }
func (s *cacheServer) GetGroupMemberIDListFromCache(_ context.Context, req *pbCache.GetGroupMemberIDListFromCacheReq) (resp *pbCache.GetGroupMemberIDListFromCacheResp, err error) { func (s *cacheServer) GetGroupMemberIDListFromCache(ctx context.Context, req *pbCache.GetGroupMemberIDListFromCacheReq) (resp *pbCache.GetGroupMemberIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp = &pbCache.GetGroupMemberIDListFromCacheResp{ resp = &pbCache.GetGroupMemberIDListFromCacheResp{
CommonResp: &pbCache.CommonResp{}, CommonResp: &sdkws.CommonResp{},
} }
userIDList, err := rocksCache.GetGroupMemberIDListFromCache(req.GroupID) ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
defer func() {
trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
trace_log.ShowLog(ctx)
}()
userIDList, err := rocksCache.GetGroupMemberIDListFromCache(ctx, req.GroupID)
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMemberIDListFromCache failed", err.Error()) constant.SetErrorForResp(err, resp.CommonResp)
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg
return resp, nil return resp, nil
} }
resp.UserIDList = userIDList resp.UserIDList = userIDList
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil
} }
func (s *cacheServer) DelGroupMemberIDListFromCache(_ context.Context, req *pbCache.DelGroupMemberIDListFromCacheReq) (resp *pbCache.DelGroupMemberIDListFromCacheResp, err error) { func (s *cacheServer) DelGroupMemberIDListFromCache(ctx context.Context, req *pbCache.DelGroupMemberIDListFromCacheReq) (resp *pbCache.DelGroupMemberIDListFromCacheResp, err error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbCache.DelGroupMemberIDListFromCacheResp{CommonResp: &sdkws.CommonResp{}}
resp = &pbCache.DelGroupMemberIDListFromCacheResp{CommonResp: &pbCache.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
if err := rocksCache.DelGroupMemberIDListFromCache(req.GroupID); err != nil { defer func() {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "args: ", req.GroupID, err.Error()) trace_log.SetContextInfo(ctx, utils.GetFuncName(1), nil, "req", req.String(), "resp", resp.String())
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode trace_log.ShowLog(ctx)
resp.CommonResp.ErrMsg = err.Error() }()
if err := rocksCache.DelGroupMemberIDListFromCache(ctx, req.GroupID); err != nil {
constant.SetErrorForResp(err, resp.CommonResp)
return resp, nil return resp, nil
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
return resp, nil return resp, nil
} }

2
pkg/common/constant/error.go
Unescape View File

@ -111,7 +111,7 @@ func SetErrorForResp(err error, commonResp *sdkws.CommonResp) {
commonResp.DetailErrMsg = err.Error() commonResp.DetailErrMsg = err.Error()
} }
func CommonResp2Err(resp sdkws.CommonResp) error { func CommonResp2Err(resp *sdkws.CommonResp) error {
if resp.ErrCode != NoError { if resp.ErrCode != NoError {
return errors.New(fmt.Sprintf("call rpc error, errCode is %d, errMsg is %s, detailErrMsg is %s", resp.ErrCode, resp.ErrMsg, resp.DetailErrMsg)) return errors.New(fmt.Sprintf("call rpc error, errCode is %d, errMsg is %s, detailErrMsg is %s", resp.ErrCode, resp.ErrMsg, resp.DetailErrMsg))
} }

1347
pkg/proto/cache/cache.pb.go vendored
View File

File diff suppressed because it is too large Load Diff

17
pkg/proto/cache/cache.proto vendored
Unescape View File

@ -1,11 +1,8 @@
syntax = "proto3"; syntax = "proto3";
import "Open-IM-Server/pkg/proto/sdk_ws/ws.proto";
option go_package = "Open_IM/pkg/proto/cache;cache"; option go_package = "Open_IM/pkg/proto/cache;cache";
package cache; package cache;
message CommonResp{
int32 errCode = 1;
string errMsg = 2;
}
message GetFriendIDListFromCacheReq { message GetFriendIDListFromCacheReq {
string userID = 1; string userID = 1;
@ -14,7 +11,7 @@ message GetFriendIDListFromCacheReq {
message GetFriendIDListFromCacheResp { message GetFriendIDListFromCacheResp {
repeated string userIDList = 1; repeated string userIDList = 1;
CommonResp commonResp = 2; server_api_params.CommonResp commonResp = 2;
} }
message DelFriendIDListFromCacheReq { message DelFriendIDListFromCacheReq {
@ -23,7 +20,7 @@ message DelFriendIDListFromCacheReq {
} }
message DelFriendIDListFromCacheResp { message DelFriendIDListFromCacheResp {
CommonResp commonResp = 1; server_api_params.CommonResp commonResp = 1;
} }
message GetBlackIDListFromCacheReq { message GetBlackIDListFromCacheReq {
@ -33,7 +30,7 @@ message GetBlackIDListFromCacheReq {
message GetBlackIDListFromCacheResp { message GetBlackIDListFromCacheResp {
repeated string userIDList = 1; repeated string userIDList = 1;
CommonResp commonResp = 2; server_api_params.CommonResp commonResp = 2;
} }
message DelBlackIDListFromCacheReq { message DelBlackIDListFromCacheReq {
@ -42,7 +39,7 @@ message DelBlackIDListFromCacheReq {
} }
message DelBlackIDListFromCacheResp { message DelBlackIDListFromCacheResp {
CommonResp commonResp = 1; server_api_params.CommonResp commonResp = 1;
} }
message GetGroupMemberIDListFromCacheReq { message GetGroupMemberIDListFromCacheReq {
@ -51,7 +48,7 @@ message GetGroupMemberIDListFromCacheReq {
} }
message GetGroupMemberIDListFromCacheResp { message GetGroupMemberIDListFromCacheResp {
CommonResp commonResp = 1; server_api_params.CommonResp commonResp = 1;
repeated string userIDList = 2; repeated string userIDList = 2;
} }
@ -61,7 +58,7 @@ message DelGroupMemberIDListFromCacheReq {
} }
message DelGroupMemberIDListFromCacheResp { message DelGroupMemberIDListFromCacheResp {
CommonResp commonResp = 1; server_api_params.CommonResp commonResp = 1;
} }
service cache{ service cache{

Write Preview
Loading…
Cancel
Save