blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 11:36:44 +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 13:12:00 +08:00
commit 380ba11af0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/common/check/user.go
View File

@ -2,6 +2,7 @@ package check
import ( import (
"OpenIM/pkg/common/config" "OpenIM/pkg/common/config"
"OpenIM/pkg/common/log"
"OpenIM/pkg/discoveryregistry" "OpenIM/pkg/discoveryregistry"
"OpenIM/pkg/errs" "OpenIM/pkg/errs"
"OpenIM/pkg/proto/sdkws" "OpenIM/pkg/proto/sdkws"
@ -29,12 +30,14 @@ func (u *UserCheck) getConn() (*grpc.ClientConn, error) {
func (u *UserCheck) GetUsersInfos(ctx context.Context, userIDs []string, complete bool) ([]*sdkws.UserInfo, error) { func (u *UserCheck) GetUsersInfos(ctx context.Context, userIDs []string, complete bool) ([]*sdkws.UserInfo, error) {
cc, err := u.getConn() cc, err := u.getConn()
if err != nil { if err != nil {
log.Error("", "call getConn err", err.Error())
return nil, err return nil, err
} }
resp, err := user.NewUserClient(cc).GetDesignateUsers(ctx, &user.GetDesignateUsersReq{ resp, err := user.NewUserClient(cc).GetDesignateUsers(ctx, &user.GetDesignateUsersReq{
UserIDs: userIDs, UserIDs: userIDs,
}) })
if err != nil { if err != nil {
log.Error("", "call GetDesignateUsers err", err.Error())
return nil, err return nil, err
} }
if complete { if complete {

6
pkg/common/tracelog/ctx.go
View File

@ -107,7 +107,11 @@ func SetCtxWarn(ctx context.Context, funcName string, err error, args ...interfa
} }
func SetContextInfo(ctx context.Context, funcName string, logLevel logrus.Level, err error, args ...interface{}) { func SetContextInfo(ctx context.Context, funcName string, logLevel logrus.Level, err error, args ...interface{}) {
t := ctx.Value(TraceLogKey).(*FuncInfos) var t *FuncInfos
var ok bool
if t, ok = ctx.Value(TraceLogKey).(*FuncInfos); !ok {
return
}
var funcInfo FuncInfo var funcInfo FuncInfo
funcInfo.Args = make(map[string]interface{}) funcInfo.Args = make(map[string]interface{})
argsHandle(args, funcInfo.Args) argsHandle(args, funcInfo.Args)