Commit d61cceeb authored by Alessio Caiazza's avatar Alessio Caiazza

Merge branch '232468-prometheus-conn-timeout' into 'master'

Set appropriate timeouts for PrometheusClient

Closes #232468

See merge request gitlab-org/gitlab!37924
parents 7cb8dac3 b039df77
---
title: Set appropriate timeouts for PrometheusClient
merge_request: 37924
author:
type: other
...@@ -132,7 +132,7 @@ module Gitlab ...@@ -132,7 +132,7 @@ module Gitlab
def http_options def http_options
strong_memoize(:http_options) do strong_memoize(:http_options) do
{ follow_redirects: false }.merge(mapped_options) { follow_redirects: false, open_timeout: 5, read_timeout: 10 }.merge(mapped_options)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment