Merge pull request #1786 from jaffee/remove-client-timeout

revert client Timeout addition
This commit is contained in:
Matthew Jaffee 2018-12-14 17:09:52 -06:00 • committed by GitHub
commit 506e9a2db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1504,15 +1504,7 @@ func GetHTTPClient(t *tls.Config) *http.Client {
if t != nil {
transport.TLSClientConfig = t
}
return &http.Client{
Transport: transport,
// Internal queries will time out after 2h 7m by default. This is
// reduced from the old default of no timeout, so it was thought we
// should keep it fairly high, but it could probably be reduced in most
// cases. It is set to an odd number in the hopes that it will be
// recognizable in stats/traces/logs when this limit is being hit.
Timeout: 127 * time.Minute,
}
return &http.Client{Transport: transport}
}
// handlPostRoaringImport