blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-01-09 13:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: changing naming irregularities under pkg and internal packages (#520)"

Browse Source 
This reverts commit e67aed5af59dc44391f8a65b40f169e2aa4b224f.
This commit is contained in:
BanTanger 2023-07-23 12:05:27 +08:00
parent e67aed5af5
commit e2b10c10d4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/common/convert/black.go
View File

@ -54,6 +54,5 @@ func BlackDB2Pb(
} }
blackPbs = append(blackPbs, blackPb) blackPbs = append(blackPbs, blackPb)
} }
return blackPbs, nil return blackPbs, nil
} }

7
pkg/common/mw/rpc_server_interceptor.go
View File

@ -110,15 +110,13 @@ func RpcServerInterceptor(
} }
log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req)) log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req))
resp, err = func() (interface{}, error) { resp, err = func() (interface{}, error) {
if err = checker.Validate(req); err != nil { if err := checker.Validate(req); err != nil {
return nil, err return nil, err
} }
return handler(ctx, req) return handler(ctx, req)
}() }()
if err == nil { if err == nil {
log.ZInfo(ctx, "rpc server resp", "funcName", funcName, "resp", rpcString(resp)) log.ZInfo(ctx, "rpc server resp", "funcName", funcName, "resp", rpcString(resp))
return resp, nil return resp, nil
} }
log.ZError(ctx, "rpc server resp", err, "funcName", funcName) log.ZError(ctx, "rpc server resp", err, "funcName", funcName)
@ -136,7 +134,7 @@ func RpcServerInterceptor(
grpcStatus := status.New(codes.Code(code), codeErr.Msg()) grpcStatus := status.New(codes.Code(code), codeErr.Msg())
var errInfo *errinfo.ErrorInfo var errInfo *errinfo.ErrorInfo
if config.Config.Log.WithStack { if config.Config.Log.WithStack {
if errors.Is(err, unwrap) { if unwrap != err {
var sti interface{ StackTrace() errors.StackTrace } var sti interface{ StackTrace() errors.StackTrace }
if errors.As(err, &sti) { if errors.As(err, &sti) {
log.ZWarn( log.ZWarn(
@ -174,7 +172,6 @@ func RpcServerInterceptor(
details, err := grpcStatus.WithDetails(errInfo) details, err := grpcStatus.WithDetails(errInfo)
if err != nil { if err != nil {
log.ZWarn(ctx, "rpc server resp WithDetails error", err, "funcName", funcName) log.ZWarn(ctx, "rpc server resp WithDetails error", err, "funcName", funcName)
return nil, errs.Wrap(err) return nil, errs.Wrap(err)
} }
log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName) log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName)