From e1154453bbcb997a5894217f962c210edf7ac556 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 19 Aug 2024 12:56:43 +0000 Subject: [PATCH] [chore] update default http client timeout to 30s (#3214) --- example/config.yaml | 6 +++--- internal/config/defaults.go | 2 +- test/envparsing.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/config.yaml b/example/config.yaml index f359db5d5..84bbe4718 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -933,9 +933,9 @@ http-client: # Duration. Timeout to use for outgoing HTTP requests. If the timeout # is exceeded, the connection to the remote server will be dropped. # A value of 0s indicates no timeout: this is not advised! - # Examples: ["5s", "10s", "0s"] - # Default: "10s" - timeout: "10s" + # Examples: ["5s", "30s", "0s"] + # Default: "30s" + timeout: "30s" ######################################## #### RESERVED IP RANGE EXCEPTIONS ###### diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 7728b4a7f..3ef988f06 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -213,7 +213,7 @@ var Defaults = Configuration{ HTTPClient: HTTPClientConfiguration{ AllowIPs: make([]string, 0), BlockIPs: make([]string, 0), - Timeout: 10 * time.Second, + Timeout: 30 * time.Second, TLSInsecureSkipVerify: false, }, diff --git a/test/envparsing.sh b/test/envparsing.sh index 6838fecc3..a32107568 100755 --- a/test/envparsing.sh +++ b/test/envparsing.sh @@ -96,7 +96,7 @@ EXPECT=$(cat << "EOF" "http-client": { "allow-ips": [], "block-ips": [], - "timeout": 10000000000, + "timeout": 30000000000, "tls-insecure-skip-verify": false }, "instance-deliver-to-shared-inboxes": false,