p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update timeout

Browse Source 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
This commit is contained in:
Victor Vieux
2014-11-13 03:21:18 +00:00
parent ad5fd5c082
commit a7280b07fa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/api/client/cli.go
View File

@ -141,14 +141,15 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
}
// Why 32? See issue 8035
timeout := 32 * time.Second
if proto == "unix" {
// no need in compressing for local communications
tr.DisableCompression = true
tr.Dial = func(dial_network, dial_addr string) (net.Conn, error) {
return net.DialTimeout(proto, addr, 32*time.Second)
return net.DialTimeout(proto, addr, timeout)
}
} else {
tr.Dial = (&net.Dialer{Timeout: 32 * time.Second}).Dial
tr.Dial = (&net.Dialer{Timeout: timeout}).Dial
}
return &DockerCli{