Prechádzať zdrojové kódy

升级一下GetDialInsecure,都集成到option里面,让项目都需要自己生成option

dcsunny 2 rokov pred
rodič
commit
d03617343c
1 zmenil súbory, kde vykonal 16 pridanie a 4 odobranie
  1. 16 4
      grpc/client.go

+ 16 - 4
grpc/client.go

@@ -23,7 +23,6 @@ type DialOption struct {
 
 func GetDialInsecure(
 	r *registry.Registry,
-	logger log.Logger,
 	clientName string,
 	endpointNameKey string, option *DialOption) (*grpc2.ClientConn, error) {
 	option = checkOption(option)
@@ -32,9 +31,7 @@ func GetDialInsecure(
 		return connMap[clientName], nil
 	}
 	endpoint := grpc.WithEndpoint(endpointNameKey)
-	if logger != nil {
-		option.Middlewares = append(option.Middlewares, logging.Client(logger))
-	}
+
 	if r == nil {
 		return nil, nil
 	}
@@ -53,6 +50,21 @@ func GetDialInsecure(
 	return conn, nil
 }
 
+func NewGrpcClientOption(logger log.Logger) *DialOption {
+	option := &DialOption{
+		Middlewares: make([]middleware.Middleware, 0),
+		Timeout:     time.Second * 60,
+	}
+
+	if len(option.GrpcOptions) == 0 {
+		option.GrpcOptions = append(option.GrpcOptions, grpc2.WithDefaultCallOptions(grpc2.MaxCallRecvMsgSize(ReceiveMsgSize)))
+	}
+	if logger != nil {
+		option.Middlewares = append(option.Middlewares, logging.Client(logger))
+	}
+	return option
+}
+
 func checkOption(option *DialOption) *DialOption {
 	if option == nil {
 		option = &DialOption{