Skip to content

Commit

Permalink
use api.Config.Timeout instead of http.Client.Timeout for 60s request…
Browse files Browse the repository at this point in the history
… timeout default (#7469)
  • Loading branch information
mjarmy authored Sep 13, 2019
1 parent 9104831 commit 8f2c394
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion api/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ func DefaultConfig() *Config {
config := &Config{
Address: "https://127.0.0.1:8200",
HttpClient: cleanhttp.DefaultPooledClient(),
Timeout: time.Second * 60,
}
config.HttpClient.Timeout = time.Second * 60

transport := config.HttpClient.Transport.(*http.Transport)
transport.TLSHandshakeTimeout = 10 * time.Second
Expand Down

0 comments on commit 8f2c394

Please sign in to comment.