Changeset 206 in code for trunk

Timestamp:

Apr 1, 2020, 2:41:17 PM (5 years ago)

Author:

contact

Message:

Set connect timeout

References: ​https://todo.sr.ht/~emersion/soju/26

Location:

trunk

Files:

• server.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/server.go

@@ -14 +14 @@
 var keepAlivePeriod = time.Minute
 var retryConnectMinDelay = time.Minute
+var connectTimeout = 15 * time.Second
 var writeTimeout = 10 * time.Second
 

trunk/upstream.go

@@ -83 +83 @@
         }
 
+        dialer := net.Dialer{Timeout: connectTimeout}
+
         logger.Printf("connecting to TLS server at address %q", addr)
-        netConn, err := tls.Dial("tcp", addr, nil)
+        netConn, err := tls.DialWithDialer(&dialer, "tcp", addr, nil)
         if err != nil {
                 return nil, fmt.Errorf("failed to dial %q: %v", addr, err)