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

pull/636/head
BanTanger 2 years ago
parent 2ba5c8b807
commit f99e27c2db

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

@ -110,13 +110,15 @@ 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)
@ -134,7 +136,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 unwrap != err { if errors.Is(err, unwrap) {
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(
@ -172,6 +174,7 @@ 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)

Loading…
Cancel
Save