diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go index f8d69ef29..ba0e2a5da 100644 --- a/pkg/common/convert/black.go +++ b/pkg/common/convert/black.go @@ -54,6 +54,5 @@ func BlackDB2Pb( } blackPbs = append(blackPbs, blackPb) } - return blackPbs, nil } diff --git a/pkg/common/mw/rpc_server_interceptor.go b/pkg/common/mw/rpc_server_interceptor.go index 981f7454d..0dba76103 100644 --- a/pkg/common/mw/rpc_server_interceptor.go +++ b/pkg/common/mw/rpc_server_interceptor.go @@ -110,15 +110,13 @@ func RpcServerInterceptor( } log.ZInfo(ctx, "rpc server req", "funcName", funcName, "req", rpcString(req)) resp, err = func() (interface{}, error) { - if err = checker.Validate(req); err != nil { + if err := checker.Validate(req); err != nil { return nil, err } - return handler(ctx, req) }() if err == nil { log.ZInfo(ctx, "rpc server resp", "funcName", funcName, "resp", rpcString(resp)) - return resp, nil } log.ZError(ctx, "rpc server resp", err, "funcName", funcName) @@ -136,7 +134,7 @@ func RpcServerInterceptor( grpcStatus := status.New(codes.Code(code), codeErr.Msg()) var errInfo *errinfo.ErrorInfo if config.Config.Log.WithStack { - if errors.Is(err, unwrap) { + if unwrap != err { var sti interface{ StackTrace() errors.StackTrace } if errors.As(err, &sti) { log.ZWarn( @@ -174,7 +172,6 @@ func RpcServerInterceptor( details, err := grpcStatus.WithDetails(errInfo) if err != nil { log.ZWarn(ctx, "rpc server resp WithDetails error", err, "funcName", funcName) - return nil, errs.Wrap(err) } log.ZWarn(ctx, "rpc server resp", err, "funcName", funcName)