diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-07-24 13:40:35 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-07-24 13:56:28 +0200 |
commit | e77f46d1296de6720a44a12c68632efcf5e65a9a (patch) | |
tree | a1157f89b2fc0e211421a2575ea80a3692e89829 /lib/gitlab/gitaly_client.rb | |
parent | 1c24eafb4106dc7890ef74093a59009e94baa705 (diff) | |
download | gitlab-ce-e77f46d1296de6720a44a12c68632efcf5e65a9a.tar.gz |
Remove timeouts for long running requests
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 58a4060cc96..c27972a84a4 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -407,7 +407,7 @@ module Gitlab # The default timeout on all Gitaly calls def self.default_timeout - return 0 if Sidekiq.server? + return no_timeout if Sidekiq.server? timeout(:gitaly_timeout_default) end @@ -420,6 +420,10 @@ module Gitlab timeout(:gitaly_timeout_medium) end + def self.no_timeout + 0 + end + def self.timeout(timeout_name) Gitlab::CurrentSettings.current_application_settings[timeout_name] end |