diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-22 18:04:34 +0000 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-30 10:38:04 +0100 |
| commit | 49ddc2edde6331f6a144827808ccf3808f247aae (patch) | |
| tree | e39b4926bedfb383bfa45f1303a64d8457780f80 /config/initializers/sidekiq.rb | |
| parent | 103d453a00bff872e018696e5f690b52b15510ea (diff) | |
| download | gitlab-ce-49ddc2edde6331f6a144827808ccf3808f247aae.tar.gz | |
Merge branch 'dm-batch-loader-sidekiq' into 'master'
Clear BatchLoader context between Sidekiq jobs
Closes #53079
See merge request gitlab-org/gitlab-ce!23308
Diffstat (limited to 'config/initializers/sidekiq.rb')
| -rw-r--r-- | config/initializers/sidekiq.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 565efc858d1..4210be2c701 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -20,6 +20,7 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs chain.add Gitlab::SidekiqMiddleware::Shutdown chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' + chain.add Gitlab::SidekiqMiddleware::BatchLoader chain.add Gitlab::SidekiqStatus::ServerMiddleware end |