From afb9cb39e2d70fe87b7c6a4b1e939a2bed0365f5 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Thu, 30 Apr 2015 17:44:34 -0400 Subject: [PATCH] generic: ssh timeout Signed-off-by: Evan Hazlett --- drivers/generic/generic.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go index 33c38bdbf8..d6f81f0a6b 100644 --- a/drivers/generic/generic.go +++ b/drivers/generic/generic.go @@ -5,6 +5,7 @@ import ( "net" "os" "path/filepath" + "time" "github.com/codegangsta/cli" "github.com/docker/machine/drivers" @@ -29,6 +30,10 @@ type Driver struct { storePath string } +const ( + defaultTimeout = 5 * time.Second +) + func init() { drivers.Register("generic", &drivers.RegisteredDriver{ New: NewDriver, @@ -165,7 +170,7 @@ func (d *Driver) GetIP() (string, error) { func (d *Driver) GetState() (state.State, error) { addr := fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort) - _, err := net.Dial("tcp", addr) + _, err := net.DialTimeout("tcp", addr, defaultTimeout) var st state.State if err != nil { st = state.Stopped