Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3131 from yichengq/remove-header-timeout

Browse Source 
discovery: remove ResponseHeaderTimeout when discovery
This commit is contained in:
Xiang Li 2015-07-15 07:50:36 +08:00
commit d0e3e2c992
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
discovery/discovery.go
View File

@ -127,8 +127,8 @@ func newDiscovery(durl, dproxyurl string, id types.ID) (*discovery, error) {
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
}).Dial, }).Dial,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
ResponseHeaderTimeout: 5 * time.Second, // TODO: add ResponseHeaderTimeout back when watch on discovery service writes header early
}, },
Endpoints: []string{u.String()}, Endpoints: []string{u.String()},
} }