diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-11-04 12:53:12 -0600 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-11-10 11:38:10 -0600 |
| commit | 9e2964c15a7d387e46e25c83afa478c12a856d77 (patch) | |
| tree | d17fbb92b21696b765b1eb3d903330c5383a7213 /app | |
| parent | d366a943ffe2ae6c3599c2ebc4469d49a103bacb (diff) | |
| download | gitlab-ce-9e2964c15a7d387e46e25c83afa478c12a856d77.tar.gz | |
Allow certain Sidekiq jobs to be throttled
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/application_setting.rb | 1 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 52e0256943a..a9dcf7615c4 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -117,6 +117,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :send_user_confirmation_email, :container_registry_token_expire_delay, :enabled_git_access_protocol, + :sidekiq_throttling_enabled, :housekeeping_enabled, :housekeeping_bitmaps_enabled, :housekeeping_incremental_repack_period, diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index bb60cc8736c..b728083e91c 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -180,6 +180,7 @@ class ApplicationSetting < ActiveRecord::Base container_registry_token_expire_delay: 5, repository_storages: ['default'], user_default_external: false, + sidekiq_throttling_enabled: false, housekeeping_enabled: true, housekeeping_bitmaps_enabled: true, housekeeping_incremental_repack_period: 10, diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 450ec322f2c..01a14accbba 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -284,6 +284,19 @@ results in fewer but larger UDP packets being sent. %fieldset + %legend Background Jobs + %p + These settings require a restart to take effect. + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :sidekiq_throttling_enabled do + = f.check_box :sidekiq_throttling_enabled + Enable Sidekiq Job Throttling + .help-block + Limit the amount of resources slow running jobs are assigned. + + %fieldset %legend Spam and Anti-bot Protection .form-group .col-sm-offset-2.col-sm-10 |