|
|
@ -4,6 +4,7 @@ import (
|
|
|
|
"OpenIM/pkg/common/log"
|
|
|
|
"OpenIM/pkg/common/log"
|
|
|
|
"OpenIM/pkg/common/mw/specialerror"
|
|
|
|
"OpenIM/pkg/common/mw/specialerror"
|
|
|
|
"OpenIM/pkg/errs"
|
|
|
|
"OpenIM/pkg/errs"
|
|
|
|
|
|
|
|
"OpenIM/pkg/proto/wrapperspb"
|
|
|
|
"context"
|
|
|
|
"context"
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"google.golang.org/grpc"
|
|
|
@ -65,12 +66,12 @@ func rpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
|
|
|
|
code = errs.ServerInternalError
|
|
|
|
code = errs.ServerInternalError
|
|
|
|
}
|
|
|
|
}
|
|
|
|
grpcStatus := status.New(codes.Code(code), codeErr.Msg())
|
|
|
|
grpcStatus := status.New(codes.Code(code), codeErr.Msg())
|
|
|
|
//if unwrap != err {
|
|
|
|
if unwrap != err {
|
|
|
|
// stack := fmt.Sprintf("%+v", err)
|
|
|
|
stack := fmt.Sprintf("%+v", err)
|
|
|
|
// if details, err := grpcStatus.WithDetails(wrapperspb.String(stack)); err == nil {
|
|
|
|
if details, err := grpcStatus.WithDetails(wrapperspb.String(stack)); err == nil {
|
|
|
|
// grpcStatus = details
|
|
|
|
grpcStatus = details
|
|
|
|
// }
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
}
|
|
|
|
log.ZWarn(ctx, "rpc resp", unwrap, "funcName", funcName)
|
|
|
|
log.ZWarn(ctx, "rpc resp", unwrap, "funcName", funcName)
|
|
|
|
return nil, grpcStatus.Err()
|
|
|
|
return nil, grpcStatus.Err()
|
|
|
|
}
|
|
|
|
}
|
|
|
|