Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2020-10-26 08:29:55 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-10-28 03:38:43 +0300
commitb64d60f3076d58403b8cb0944face5b9cdeb7368 (patch)
treebdb9a08be6e7d8c0234fef57498661b12f4ae1c1
parentb8b246288a03f85b53dd4433945b9186ee2ad09d (diff)
Add more client timeouts
-rw-r--r--internal/httptransport/transport.go4
-rw-r--r--internal/httptransport/transport_test.go3
2 files changed, 7 insertions, 0 deletions
diff --git a/internal/httptransport/transport.go b/internal/httptransport/transport.go
index bc871ea7..7d388d81 100644
--- a/internal/httptransport/transport.go
+++ b/internal/httptransport/transport.go
@@ -43,6 +43,10 @@ func newInternalTransport() *http.Transport {
MaxIdleConns: 100,
MaxIdleConnsPerHost: 100,
IdleConnTimeout: 90 * time.Second,
+ // Set more timeouts https://gitlab.com/gitlab-org/gitlab-pages/-/issues/495
+ TLSHandshakeTimeout: 10 * time.Second,
+ ResponseHeaderTimeout: 15 * time.Second,
+ ExpectContinueTimeout: 1 * time.Second,
}
}
diff --git a/internal/httptransport/transport_test.go b/internal/httptransport/transport_test.go
index a4105bef..5df0175a 100644
--- a/internal/httptransport/transport_test.go
+++ b/internal/httptransport/transport_test.go
@@ -92,4 +92,7 @@ func TestInternalTransportShouldHaveCustomConnectionPoolSettings(t *testing.T) {
require.EqualValues(t, 100, InternalTransport.MaxIdleConnsPerHost)
require.EqualValues(t, 0, InternalTransport.MaxConnsPerHost)
require.EqualValues(t, 90*time.Second, InternalTransport.IdleConnTimeout)
+ require.EqualValues(t, 10*time.Second, InternalTransport.TLSHandshakeTimeout)
+ require.EqualValues(t, 15*time.Second, InternalTransport.ResponseHeaderTimeout)
+ require.EqualValues(t, 1*time.Second, InternalTransport.ExpectContinueTimeout)
}