daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable timeout for push 

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
master
Victor Vieux 2014-06-07 23:48:25 +00:00
parent 80db172a18
commit 4ec6e68e04
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/registry.go
View File

@ -790,8 +790,13 @@ func AddRequiredHeadersToRedirectedRequests(req *http.Request, via []*http.Reque
return nil return nil
} }
func NewRegistry(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, indexEndpoint string) (r *Registry, err error) { func NewRegistry(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, indexEndpoint string, timeout bool) (r *Registry, err error) {
httpDial := func(proto string, addr string) (net.Conn, error) { httpTransport := &http.Transport{
DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment,
}
if timeout {
httpTransport.Dial = func(proto string, addr string) (net.Conn, error) {
conn, err := net.Dial(proto, addr) conn, err := net.Dial(proto, addr)
if err != nil { if err != nil {
return nil, err return nil, err
@ -799,13 +804,7 @@ func NewRegistry(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, inde
conn = utils.NewTimeoutConn(conn, time.Duration(1)*time.Minute) conn = utils.NewTimeoutConn(conn, time.Duration(1)*time.Minute)
return conn, nil return conn, nil
} }
httpTransport := &http.Transport{
Dial: httpDial,
DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment,
} }
r = &Registry{ r = &Registry{
authConfig: authConfig, authConfig: authConfig,
client: &http.Client{ client: &http.Client{

2
docs/registry_test.go
View File

@ -18,7 +18,7 @@ var (
func spawnTestRegistry(t *testing.T) *Registry { func spawnTestRegistry(t *testing.T) *Registry {
authConfig := &AuthConfig{} authConfig := &AuthConfig{}
r, err := NewRegistry(authConfig, utils.NewHTTPRequestFactory(), makeURL("/v1/")) r, err := NewRegistry(authConfig, utils.NewHTTPRequestFactory(), makeURL("/v1/"), true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
docs/service.go
View File

@ -82,7 +82,7 @@ func (s *Service) Search(job *engine.Job) engine.Status {
job.GetenvJson("authConfig", authConfig) job.GetenvJson("authConfig", authConfig)
job.GetenvJson("metaHeaders", metaHeaders) job.GetenvJson("metaHeaders", metaHeaders)
r, err := NewRegistry(authConfig, HTTPRequestFactory(metaHeaders), IndexServerAddress()) r, err := NewRegistry(authConfig, HTTPRequestFactory(metaHeaders), IndexServerAddress(), true)
if err != nil { if err != nil {
return job.Error(err) return job.Error(err)
} }