summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-01-25 20:30:29 +0000
committerDouwe Maan <douwe@gitlab.com>2017-01-25 20:30:29 +0000
commite74c6ae6b60900c7f0b6a34c843fa2630a4685bc (patch)
treea65191948ae860397df698dfbc85ba91c96f4e85 /config
parent844bf10847af67d2561ef137fcfbe6ba61204e6c (diff)
parent88e627cf14b47ca5d63f2cb0ffe24124fb4b116a (diff)
downloadgitlab-ce-e74c6ae6b60900c7f0b6a34c843fa2630a4685bc.tar.gz
Merge branch 'refresh-authorizations-fork-join' into 'master'
Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
Diffstat (limited to 'config')
-rw-r--r--config/initializers/sidekiq.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 5a7365bb0f6..fa318384405 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -12,6 +12,11 @@ Sidekiq.configure_server do |config|
chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS']
chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0'
+ chain.add Gitlab::SidekiqStatus::ServerMiddleware
+ end
+
+ config.client_middleware do |chain|
+ chain.add Gitlab::SidekiqStatus::ClientMiddleware
end
# Sidekiq-cron: load recurring jobs from gitlab.yml
@@ -46,6 +51,10 @@ end
Sidekiq.configure_client do |config|
config.redis = redis_config_hash
+
+ config.client_middleware do |chain|
+ chain.add Gitlab::SidekiqStatus::ClientMiddleware
+ end
end
# The Sidekiq client API always adds the queue to the Sidekiq queue