docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2048 from nathanleclaire/increase_ssh_timeout 

Increase SSH timeout back to five minutes
This commit is contained in:
Nathan LeClaire 2015-10-21 16:33:58 -07:00
parent de5d052985 4157dff31c
commit 19cb0d9b07
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmachine/drivers/utils.go
View File

@ -2,7 +2,6 @@ package drivers
import ( import (
"fmt" "fmt"
"time"
"github.com/docker/machine/libmachine/log" "github.com/docker/machine/libmachine/log"
"github.com/docker/machine/libmachine/mcnutils" "github.com/docker/machine/libmachine/mcnutils"
@ -64,7 +63,7 @@ func sshAvailableFunc(d Driver) func() bool {
func WaitForSSH(d Driver) error { func WaitForSSH(d Driver) error {
// Try to dial SSH for 30 seconds before timing out. // Try to dial SSH for 30 seconds before timing out.
if err := mcnutils.WaitForSpecific(sshAvailableFunc(d), 6, 5*time.Second); err != nil { if err := mcnutils.WaitFor(sshAvailableFunc(d)); err != nil {
return fmt.Errorf("Too many retries waiting for SSH to be available. Last error: %s", err) return fmt.Errorf("Too many retries waiting for SSH to be available. Last error: %s", err)
} }
return nil return nil