blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-27 03:58:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error code standardization

Browse Source
This commit is contained in:
skiffer-git 2023-01-04 15:51:02 +08:00
parent c076f16793
commit 5a2a57c706
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/rpc/group/group.go
View File

@ -99,7 +99,7 @@ func (s *groupServer) 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("", "RegisterEtcd failed ", err.Error()) log.NewError("", "RegisterEtcd failed ", err.Error())
panic(utils.Wrap(err, "register group module rpc to etcd err")) panic(utils.Wrap(err, "register group module rpc to etcd err"))
@ -844,24 +844,26 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup.
} }
func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsInfoReq) (*pbGroup.GetGroupsInfoResp, error) { func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsInfoReq) (*pbGroup.GetGroupsInfoResp, error) {
log.NewInfo(req.OperationID, "GetGroupsInfo args ", req.String()) nCtx := trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID)
trace_log.SetRpcReqInfo(nCtx, utils.GetSelfFuncName(), req.String())
defer trace_log.ShowLog(nCtx)
resp := pbGroup.GetGroupsInfoResp{}
groupsInfoList := make([]*open_im_sdk.GroupInfo, 0) groupsInfoList := make([]*open_im_sdk.GroupInfo, 0)
for _, groupID := range req.GroupIDList { for _, groupID := range req.GroupIDList {
groupInfoFromRedis, err := rocksCache.GetGroupInfoFromCache(groupID) groupInfoFromRedis, err := rocksCache.GetGroupInfoFromCache(groupID)
if err != nil { if err != nil {
log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), groupID) SetErr(nCtx, "", err, &resp.ErrCode, &resp.ErrMsg, "groupID ", groupID)
continue continue
} }
var groupInfo open_im_sdk.GroupInfo var groupInfo open_im_sdk.GroupInfo
cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromRedis) cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromRedis)
//groupInfo.NeedVerification
groupInfo.NeedVerification = groupInfoFromRedis.NeedVerification groupInfo.NeedVerification = groupInfoFromRedis.NeedVerification
groupsInfoList = append(groupsInfoList, &groupInfo) groupsInfoList = append(groupsInfoList, &groupInfo)
} }
resp.GroupInfoList = groupsInfoList
resp := pbGroup.GetGroupsInfoResp{GroupInfoList: groupsInfoList} trace_log.SetRpcRespInfo(nCtx, utils.GetSelfFuncName(), resp.String())
log.NewInfo(req.OperationID, "GetGroupsInfo rpc return ", resp.String())
return &resp, nil return &resp, nil
} }

33
pkg/common/constant/error.go
View File

@ -2,6 +2,7 @@ package constant
import ( import (
sdkws "Open_IM/pkg/proto/sdk_ws" sdkws "Open_IM/pkg/proto/sdk_ws"
"encoding/json"
"errors" "errors"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -42,8 +43,8 @@ var (
ErrOwnerNotAllowedQuit = ErrInfo{OwnerNotAllowedQuitError, "OwnerNotAllowedQuitError"} ErrOwnerNotAllowedQuit = ErrInfo{OwnerNotAllowedQuitError, "OwnerNotAllowedQuitError"}
ErrRegisteredAlready = ErrInfo{RegisteredAlreadyError, "RegisteredAlreadyError"} ErrRegisteredAlready = ErrInfo{RegisteredAlreadyError, "RegisteredAlreadyError"}
ErrDefaultOther = ErrInfo{DefaultOtherError, "DefaultOtherError"} ErrDefaultOther = ErrInfo{DefaultOtherError, "DefaultOtherError"}
ErrData = ErrInfo{DataError, "DataError"}
ErrTokenExpired = ErrInfo{TokenExpiredError, "TokenExpiredError"} ErrTokenExpired = ErrInfo{TokenExpiredError, "TokenExpiredError"}
ErrTokenInvalid = ErrInfo{TokenInvalidError, "TokenInvalidError"} // ErrTokenInvalid = ErrInfo{TokenInvalidError, "TokenInvalidError"} //
ErrTokenMalformed = ErrInfo{TokenMalformedError, "TokenMalformedError"} //格式错误 ErrTokenMalformed = ErrInfo{TokenMalformedError, "TokenMalformedError"} //格式错误
@ -61,21 +62,22 @@ var (
//) //)
func ToAPIErrWithErr(err error) ErrInfo { func ToAPIErrWithErr(err error) ErrInfo {
errTarget := errors.New("")
var errInfo ErrInfo
switch { switch {
case errors.As(err, &errTarget): case errors.Is(err, gorm.ErrRecordNotFound):
if errors.Is(errTarget, gorm.ErrRecordNotFound) { return ErrRecordNotFound
return ErrRecordNotFound case errors.Is(err, ErrArgs):
} return ErrArgs
case errors.As(err, &errInfo): case errors.Is(err, ErrDatabase):
if errors.Is(errInfo, ErrArgs) { return ErrDatabase
return ErrArgs }
}
if errors.Is(errInfo, ErrDatabase) {
return ErrDatabase
}
errTarget := errors.New("")
var mErr *json.MarshalerError
switch {
case errors.As(err, &mErr):
return ErrData
case errors.As(err, errTarget):
return ErrDatabase
} }
return ErrDefaultOther return ErrDefaultOther
} }
@ -118,6 +120,7 @@ const (
NoPermissionError = 90005 //权限不足 NoPermissionError = 90005 //权限不足
DefaultOtherError = 90006 //其他错误 DefaultOtherError = 90006 //其他错误
DataError = 90007 //数据错误
) )
// 账号错误码 // 账号错误码