mirror of https://github.com/docker/docs.git
generic: ssh timeout
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
parent
2d525d0abd
commit
afb9cb39e2
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/codegangsta/cli"
|
"github.com/codegangsta/cli"
|
||||||
"github.com/docker/machine/drivers"
|
"github.com/docker/machine/drivers"
|
||||||
|
|
@ -29,6 +30,10 @@ type Driver struct {
|
||||||
storePath string
|
storePath string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultTimeout = 5 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
drivers.Register("generic", &drivers.RegisteredDriver{
|
drivers.Register("generic", &drivers.RegisteredDriver{
|
||||||
New: NewDriver,
|
New: NewDriver,
|
||||||
|
|
@ -165,7 +170,7 @@ func (d *Driver) GetIP() (string, error) {
|
||||||
|
|
||||||
func (d *Driver) GetState() (state.State, error) {
|
func (d *Driver) GetState() (state.State, error) {
|
||||||
addr := fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort)
|
addr := fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort)
|
||||||
_, err := net.Dial("tcp", addr)
|
_, err := net.DialTimeout("tcp", addr, defaultTimeout)
|
||||||
var st state.State
|
var st state.State
|
||||||
if err != nil {
|
if err != nil {
|
||||||
st = state.Stopped
|
st = state.Stopped
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue