diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-22 18:04:34 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-22 18:04:34 +0000 |
| commit | a033faa2a6b4cb41bcc9eb37cd127e1de2c91c35 (patch) | |
| tree | 527c7008543bf57b76b17bac27e9eb7a8f18b20a /lib | |
| parent | 0a42c7cbaae51466a67a4011859726c29bc24da4 (diff) | |
| parent | 1b8a791829a3c6226f5185f2433ddf632d2d945d (diff) | |
| download | gitlab-ce-a033faa2a6b4cb41bcc9eb37cd127e1de2c91c35.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 'lib')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/batch_loader.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_middleware/batch_loader.rb b/lib/gitlab/sidekiq_middleware/batch_loader.rb new file mode 100644 index 00000000000..75c4efc3042 --- /dev/null +++ b/lib/gitlab/sidekiq_middleware/batch_loader.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Gitlab + module SidekiqMiddleware + class BatchLoader + def call(worker, job, queue) + yield + ensure + ::BatchLoader::Executor.clear_current + end + end + end +end |