Fix grpc client dial context

micro-community · Aug 24, 2023 · fe5e310 · fe5e310
1 parent 0941b13
commit fe5e310
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/service/client/grpc/grpc.go b/service/client/grpc/grpc.go
@@ -129,10 +129,10 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), opts.DialTimeout)
-	defer cancel()
+	dialCtx, timeout := context.WithTimeout(ctx, opts.DialTimeout)
+	defer timeout()
 
-	cc, err := g.pool.getConn(ctx, addr, grpcDialOptions...)
+	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
 	}
@@ -208,11 +208,10 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		grpcDialOptions = append(grpcDialOptions, opts...)
 	}
 
-	var timeout context.CancelFunc
-	ctx, timeout = context.WithTimeout(ctx, opts.DialTimeout)
+	dialCtx, timeout := context.WithTimeout(ctx, opts.DialTimeout)
 	defer timeout()
 
-	cc, err := g.pool.getConn(ctx, addr, grpcDialOptions...)
+	cc, err := g.pool.getConn(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
 	}