builder/digitalocean: timeout TCP connections to SSH

867e9d1c · Mitchell Hashimoto · b78fd17a · 867e9d1c
Commit 867e9d1c authored Jun 19, 2013 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

builder/digitalocean/step_connect_ssh.go builder/digitalocean/step_connect_ssh.go +4 -1

No files found.
--- a/builder/digitalocean/step_connect_ssh.go
+++ b/builder/digitalocean/step_connect_ssh.go
@@ -61,7 +61,10 @@ func (s *stepConnectSSH) Run(state map[string]interface{}) multistep.StepAction
 			log.Printf(
 				"Opening TCP conn for SSH to %s:%d (attempt %d)",
 				ipAddress, config.SSHPort, attempts)
-			s.conn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", ipAddress, config.SSHPort))
+			s.conn, err = net.DialTimeout(
+				"tcp",
+				fmt.Sprintf("%s:%d", ipAddress, config.SSHPort),
+				10*time.Second)
 			if err == nil {
 				break
 			}