luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1117 from hashicorp/f-docker-timeouts

Browse source 
Timeout docker connections after 1 minute
This commit is contained in:
Alex Dadgar 2016-04-22 15:31:16 -07:00
parent 2f5575962d ae0a54eb70
commit e1a9077654
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/driver/docker.go
View file

@ -42,6 +42,10 @@ const (
// The key populated in Node Attributes to indicate presence of the Docker // The key populated in Node Attributes to indicate presence of the Docker
// driver // driver
dockerDriverAttr = "driver.docker" dockerDriverAttr = "driver.docker"
// dockerTimeout is the length of time a request can be outstanding before
// it is timed out.
dockerTimeout = 1 * time.Minute
) )
type DockerDriver struct { type DockerDriver struct {
@ -224,11 +228,13 @@ func (d *DockerDriver) dockerClient() (*docker.Client, error) {
d.logger.Printf("[DEBUG] driver.docker: using standard client connection to %s", dockerEndpoint) d.logger.Printf("[DEBUG] driver.docker: using standard client connection to %s", dockerEndpoint)
client, err = docker.NewClient(dockerEndpoint) client, err = docker.NewClient(dockerEndpoint)
} }
client.HTTPClient.Timeout = dockerTimeout
return return
} }
d.logger.Println("[DEBUG] driver.docker: using client connection initialized from environment") d.logger.Println("[DEBUG] driver.docker: using client connection initialized from environment")
client, err = docker.NewClientFromEnv() client, err = docker.NewClientFromEnv()
client.HTTPClient.Timeout = dockerTimeout
}) })
return client, err return client, err
} }