Merge pull request #3024 from xiang90/fix_discovery
discovery: add timeouts for discovery clientrelease-2.1
commit
c221844d6b
|
@ -18,6 +18,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
|
@ -120,7 +121,15 @@ func newDiscovery(durl, dproxyurl string, id types.ID) (*discovery, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
cfg := client.Config{
|
cfg := client.Config{
|
||||||
Transport: &http.Transport{Proxy: pf},
|
Transport: &http.Transport{
|
||||||
|
Proxy: pf,
|
||||||
|
Dial: (&net.Dialer{
|
||||||
|
Timeout: 30 * time.Second,
|
||||||
|
KeepAlive: 30 * time.Second,
|
||||||
|
}).Dial,
|
||||||
|
TLSHandshakeTimeout: 10 * time.Second,
|
||||||
|
ResponseHeaderTimeout: 5 * time.Second,
|
||||||
|
},
|
||||||
Endpoints: []string{u.String()},
|
Endpoints: []string{u.String()},
|
||||||
}
|
}
|
||||||
c, err := client.New(cfg)
|
c, err := client.New(cfg)
|
||||||
|
|
Loading…
Reference in New Issue