This commit is contained in:
wangchuxiao 2023-03-14 20:05:48 +08:00
parent 37999fe322
commit 2a49abc74a
3 changed files with 7 additions and 13 deletions

View File

@ -27,13 +27,11 @@ func Call[A, B, C any](
}
cli, err := client()
if err != nil {
log.ZError(c, "get rpc client conn failed", err)
apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return
}
data, err := rpc(cli, c, &req)
if err != nil {
log.ZError(c, "rpc call failed", err)
apiresp.GinError(c, err) // RPC调用失败
return
}

View File

@ -56,7 +56,6 @@ type ZapLogger struct {
func NewZapLogger() (*ZapLogger, error) {
zapConfig := zap.Config{
Level: zap.NewAtomicLevelAt(zapcore.DebugLevel),
Development: true,
Encoding: "json",
EncoderConfig: zap.NewProductionEncoderConfig(),
DisableStacktrace: true,
@ -78,10 +77,6 @@ func NewZapLogger() (*ZapLogger, error) {
return zl, nil
}
func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
enc.AppendString(t.Format("2006-01-02 15:04:05"))
}
func (l *ZapLogger) cores() (zap.Option, error) {
c := zap.NewProductionEncoderConfig()
c.EncodeTime = zapcore.ISO8601TimeEncoder

View File

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