GitList

Browse code

Merge pull request #9260 from LK4D4/increase_proxy_timeout

Increase timeout for userland proxy starting

Michael Crosby authored on 2014/11/21 07:20:31
Showing 1 changed files

daemon/networkdriver/portmapper/proxy.go index e4a17bc..5d0aa0b 100644

daemon/networkdriver/portmapper/proxy.go

@@ -145,7 +145,7 @@ func (p *proxyCommand) Start() error {
 	select {
 	case err := <-errchan:
 		return err
-	case <-time.After(1 * time.Second):
+	case <-time.After(16 * time.Second):
 		return fmt.Errorf("Timed out proxy starting the userland proxy")
 	}
 }

...	...	@@ -145,7 +145,7 @@ func (p *proxyCommand) Start() error {
145	145	select {
146	146	case err := <-errchan:
147	147	return err
148		- case <-time.After(1 * time.Second):
	148	+ case <-time.After(16 * time.Second):
149	149	return fmt.Errorf("Timed out proxy starting the userland proxy")
150	150	}
151	151	}