Merge pull request #6277 from philips/remove-unneeded-time-duration

registry: remove unneeded time.Duration()
This commit is contained in:
unclejack 2014-06-11 20:33:22 +03:00
commit ae03803d05

View file

@ -37,12 +37,12 @@ func pingRegistryEndpoint(endpoint string) (RegistryInfo, error) {
} }
httpDial := func(proto string, addr string) (net.Conn, error) { httpDial := func(proto string, addr string) (net.Conn, error) {
// Set the connect timeout to 5 seconds // Set the connect timeout to 5 seconds
conn, err := net.DialTimeout(proto, addr, time.Duration(5)*time.Second) conn, err := net.DialTimeout(proto, addr, 5*time.Second)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Set the recv timeout to 10 seconds // Set the recv timeout to 10 seconds
conn.SetDeadline(time.Now().Add(time.Duration(10) * time.Second)) conn.SetDeadline(time.Now().Add(10 * time.Second))
return conn, nil return conn, nil
} }
httpTransport := &http.Transport{ httpTransport := &http.Transport{
@ -801,7 +801,7 @@ func NewRegistry(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, inde
if err != nil { if err != nil {
return nil, err return nil, err
} }
conn = utils.NewTimeoutConn(conn, time.Duration(1)*time.Minute) conn = utils.NewTimeoutConn(conn, 1*time.Minute)
return conn, nil return conn, nil
} }
} }