diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-11-29 09:12:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-29 09:12:12 +0000 |
| commit | 64e5f996fa01d2e9c8462cfbb647997531eaf6c7 (patch) | |
| tree | b3bebc2fd1be9822f8be2124aee9acff5acd3ded /lib/api | |
| parent | a4f8dddc212fcd91f6a4a09e92b2de6117a21305 (diff) | |
| download | gitlab-ce-64e5f996fa01d2e9c8462cfbb647997531eaf6c7.tar.gz | |
Add timeouts for Gitaly calls
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 06373fe5069..cee4d309816 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -123,6 +123,9 @@ module API end optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.' + optional :gitaly_timeout_default, type: Integer, desc: 'Default Gitaly timeout, in seconds. Set to 0 to disable timeouts.' + optional :gitaly_timeout_medium, type: Integer, desc: 'Medium Gitaly timeout, in seconds. Set to 0 to disable timeouts.' + optional :gitaly_timeout_fast, type: Integer, desc: 'Gitaly fast operation timeout, in seconds. Set to 0 to disable timeouts.' ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |