diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-14 23:19:32 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-14 23:19:32 +0000 |
| commit | e9e538a20c4c1d6cdeb88b8ab08e14ef482e157e (patch) | |
| tree | ad12039455283c922cb05378e37cc4c0f272a574 | |
| parent | bd0def2c9601236bd49063264963940fcf1e2459 (diff) | |
| parent | b05003af4753062d3dde37f57ff28854f417f673 (diff) | |
| download | gitlab-ce-e9e538a20c4c1d6cdeb88b8ab08e14ef482e157e.tar.gz | |
Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master'
SidekiqStatus need to be qualified in some cases
Closes #27759
See merge request !9235
| -rw-r--r-- | lib/gitlab/sidekiq_status/client_middleware.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_status/server_middleware.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_status/client_middleware.rb b/lib/gitlab/sidekiq_status/client_middleware.rb index 779a9998b22..d47609f490d 100644 --- a/lib/gitlab/sidekiq_status/client_middleware.rb +++ b/lib/gitlab/sidekiq_status/client_middleware.rb @@ -2,7 +2,7 @@ module Gitlab module SidekiqStatus class ClientMiddleware def call(_, job, _, _) - SidekiqStatus.set(job['jid']) + Gitlab::SidekiqStatus.set(job['jid']) yield end end diff --git a/lib/gitlab/sidekiq_status/server_middleware.rb b/lib/gitlab/sidekiq_status/server_middleware.rb index 31dfa46ff9d..ceab10b8301 100644 --- a/lib/gitlab/sidekiq_status/server_middleware.rb +++ b/lib/gitlab/sidekiq_status/server_middleware.rb @@ -4,7 +4,7 @@ module Gitlab def call(worker, job, queue) ret = yield - SidekiqStatus.unset(job['jid']) + Gitlab::SidekiqStatus.unset(job['jid']) ret end |