diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-21 19:26:12 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-21 19:26:12 +0000 |
| commit | 367d3d97048df14bd5c3e5f33f67bb3bbc16c1c8 (patch) | |
| tree | 9fb94363e5b08e0a42aea608132e98a419c03da1 /lib | |
| parent | 646aae3e4f0f9c547397fdf55cc2205b0171b565 (diff) | |
| parent | 0db5f576fedfa5c4b2a1f9f01a0fdc4cbcd759f9 (diff) | |
| download | gitlab-ce-367d3d97048df14bd5c3e5f33f67bb3bbc16c1c8.tar.gz | |
Merge branch 'only-limit-fetch-when-requested' into 'master'
Only require sidekiq-limit_fetch when enabled in settings
Closes #36253
See merge request !13715
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/sidekiq_throttler.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_throttler.rb b/lib/gitlab/sidekiq_throttler.rb index d4d39a888e7..5512afa45a8 100644 --- a/lib/gitlab/sidekiq_throttler.rb +++ b/lib/gitlab/sidekiq_throttler.rb @@ -3,6 +3,8 @@ module Gitlab class << self def execute! if Gitlab::CurrentSettings.sidekiq_throttling_enabled? + require 'sidekiq-limit_fetch' + Gitlab::CurrentSettings.current_application_settings.sidekiq_throttling_queues.each do |queue| Sidekiq::Queue[queue].limit = queue_limit end |