diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-14 18:37:21 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-14 18:37:21 +0100 |
| commit | b05003af4753062d3dde37f57ff28854f417f673 (patch) | |
| tree | c89cdd272cef0a867db97f208bbef31e1da11cd0 | |
| parent | 059f47b6ba09ae1a6b1dbfc2debf82064d8793fc (diff) | |
| download | gitlab-ce-27759-fix-sidekiq_status-client_middleware-issue.tar.gz | |
SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issue
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 |