|
@@ -23,7 +23,6 @@ type DialOption struct {
|
|
|
|
|
|
|
|
func GetDialInsecure(
|
|
func GetDialInsecure(
|
|
|
r *registry.Registry,
|
|
r *registry.Registry,
|
|
|
- logger log.Logger,
|
|
|
|
|
clientName string,
|
|
clientName string,
|
|
|
endpointNameKey string, option *DialOption) (*grpc2.ClientConn, error) {
|
|
endpointNameKey string, option *DialOption) (*grpc2.ClientConn, error) {
|
|
|
option = checkOption(option)
|
|
option = checkOption(option)
|
|
@@ -32,9 +31,7 @@ func GetDialInsecure(
|
|
|
return connMap[clientName], nil
|
|
return connMap[clientName], nil
|
|
|
}
|
|
}
|
|
|
endpoint := grpc.WithEndpoint(endpointNameKey)
|
|
endpoint := grpc.WithEndpoint(endpointNameKey)
|
|
|
- if logger != nil {
|
|
|
|
|
- option.Middlewares = append(option.Middlewares, logging.Client(logger))
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if r == nil {
|
|
if r == nil {
|
|
|
return nil, nil
|
|
return nil, nil
|
|
|
}
|
|
}
|
|
@@ -53,6 +50,21 @@ func GetDialInsecure(
|
|
|
return conn, nil
|
|
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 {
|
|
func checkOption(option *DialOption) *DialOption {
|
|
|
if option == nil {
|
|
if option == nil {
|
|
|
option = &DialOption{
|
|
option = &DialOption{
|