fix golang linter suggestions

fivexl · Nov 7, 2024 · 36ae71a · 36ae71a
1 parent 64b629d
commit 36ae71a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/grpc_healthcheck.go b/grpc_healthcheck.go
@@ -50,7 +50,7 @@ func grpchealthprobe(flAddr string) (string, int) {
 
 	opts := []grpc.DialOption{
 		grpc.WithUserAgent(flUserAgent),
-		grpc.WithBlock(),
+		grpc.WithTimeout(flConnTimeout), // Add connection timeout
 	}
 	if flTLS && flSPIFFE {
 		log.Printf("-tls and -spiffe are mutually incompatible")
@@ -98,9 +98,7 @@ func grpchealthprobe(flAddr string) (string, int) {
 		log.Print("establishing connection")
 	}
 	connStart := time.Now()
-	dialCtx, dialCancel := context.WithTimeout(ctx, flConnTimeout)
-	defer dialCancel()
-	conn, err := grpc.DialContext(dialCtx, flAddr, opts...)
+	conn, err := grpc.Dial(flAddr, opts...)
 	if err != nil {
 		if err == context.DeadlineExceeded {
 			log.Printf("timeout: failed to connect service %q within %v", flAddr, flConnTimeout)