blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-25 11:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-03-13 15:39:54 +08:00
commit 217765be6e
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rpc/auth/auth.go
View File

@ -39,6 +39,10 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) { func (s *authServer) UserToken(ctx context.Context, req *pbAuth.UserTokenReq) (*pbAuth.UserTokenResp, error) {
log.Info("", "rpc come UserToken") log.Info("", "rpc come UserToken")
operationID, ok := ctx.Value(constant.OperationID).(string)
if !ok {
log.Error("2222", "ctx missing operationID", operationID)
}
resp := pbAuth.UserTokenResp{} resp := pbAuth.UserTokenResp{}
if _, err := s.userCheck.GetUserInfo(ctx, req.UserID); err != nil { if _, err := s.userCheck.GetUserInfo(ctx, req.UserID); err != nil {
log.Info("", "UserToken err:", err.Error()) log.Info("", "UserToken err:", err.Error())

2
internal/startrpc/start.go
View File

@ -31,7 +31,7 @@ func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(c
return utils.Wrap1(err) return utils.Wrap1(err)
} }
defer zkClient.Close() defer zkClient.Close()
zkClient.AddOption(grpc.WithTransportCredentials(insecure.NewCredentials())) zkClient.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()))
registerIP, err := network.GetRpcRegisterIP(config.Config.RpcRegisterIP) registerIP, err := network.GetRpcRegisterIP(config.Config.RpcRegisterIP)
if err != nil { if err != nil {
return err return err

2
pkg/common/db/relation/user_model.go
View File

@ -45,7 +45,7 @@ func (u *UserGorm) Find(ctx context.Context, userIDs []string) (users []*relatio
defer func() { defer func() {
tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userIDs", userIDs, "users", users) tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userIDs", userIDs, "users", users)
}() }()
err = utils.Wrap(u.DB.Where("user_id in (?)", userIDs).Find(&users).Error, "") err = utils.Wrap(u.DB.Debug().Where("user_id in ?", userIDs).Find(&users).Error, "")
return users, err return users, err
} }

3
pkg/common/mw/rpc.go
View File

@ -41,6 +41,8 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
opUserID = opts[0] opUserID = opts[0]
} }
ctx = tracelog.SetFuncInfos(ctx, funcName, operationID) ctx = tracelog.SetFuncInfos(ctx, funcName, operationID)
ctx = context.WithValue(ctx, OperationID, operationID)
ctx = context.WithValue(ctx, OpUserID, opUserID)
tracelog.SetCtxInfo(ctx, funcName, err, "opUserID", opUserID, "rpcReq", rpcString(req)) tracelog.SetCtxInfo(ctx, funcName, err, "opUserID", opUserID, "rpcReq", rpcString(req))
resp, err = handler(ctx, req) resp, err = handler(ctx, req)
if err != nil { if err != nil {
@ -58,6 +60,7 @@ func rpcClientInterceptor(ctx context.Context, method string, req, reply interfa
} }
operationID, ok := ctx.Value(constant.OperationID).(string) operationID, ok := ctx.Value(constant.OperationID).(string)
if !ok { if !ok {
log.Error("1111", "ctx missing operationID")
return errs.ErrArgs.Wrap("ctx missing operationID") return errs.ErrArgs.Wrap("ctx missing operationID")
} }
md := metadata.Pairs(constant.OperationID, operationID) md := metadata.Pairs(constant.OperationID, operationID)