Apply connect timeout to Dial

vcabbage · Sep 4, 2019 · 5f7db87 · 5f7db87
1 parent 1c663ac
commit 5f7db87
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/client.go b/client.go
@@ -70,13 +70,15 @@ func Dial(addr string, opts ...ConnOption) (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	dialer := &net.Dialer{Timeout: c.connectTimeout}
 	switch u.Scheme {
 	case "amqp", "":
-		c.net, err = net.Dial("tcp", host+":"+port)
+		c.net, err = dialer.Dial("tcp", host+":"+port)
 	case "amqps":
 		c.initTLSConfig()
 		c.tlsNegotiation = false
-		c.net, err = tls.Dial("tcp", host+":"+port, c.tlsConfig)
+		c.net, err = tls.DialWithDialer(dialer, "tcp", host+":"+port, c.tlsConfig)
 	default:
 		return nil, errorErrorf("unsupported scheme %q", u.Scheme)
 	}