diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 18:09:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 18:09:02 +0000 |
commit | 951616a26a61e880860ad862c1d45a8e3762b4bc (patch) | |
tree | ed6fe722e955aff38e13ca02d2aa7fdd4239c863 /lib/gitlab/sidekiq_middleware | |
parent | e06d0e779673d745972863302858105aad9032e5 (diff) | |
download | gitlab-ce-951616a26a61e880860ad862c1d45a8e3762b4bc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
-rw-r--r-- | lib/gitlab/sidekiq_middleware/request_store_middleware.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/sidekiq_middleware/request_store_middleware.rb b/lib/gitlab/sidekiq_middleware/request_store_middleware.rb index 8824f81e8e3..f6142bd6ca5 100644 --- a/lib/gitlab/sidekiq_middleware/request_store_middleware.rb +++ b/lib/gitlab/sidekiq_middleware/request_store_middleware.rb @@ -3,12 +3,12 @@ module Gitlab module SidekiqMiddleware class RequestStoreMiddleware + include Gitlab::WithRequestStore + def call(worker, job, queue) - RequestStore.begin! - yield - ensure - RequestStore.end! - RequestStore.clear! + with_request_store do + yield + end end end end |