diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 09:11:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 09:11:59 +0300 |
| commit | eef9e3fbb512d7d7b9873279ef13fdc6a203a6fb (patch) | |
| tree | 5ba4747731ab29d2faea7600c0b1a4b4800fd9ef /lib/gitlab/sidekiq_status | |
| parent | 104ac5e939f8bc7618fb16fb94f08c9b47637d08 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_status')
| -rw-r--r-- | lib/gitlab/sidekiq_status/client_middleware.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/sidekiq_status/client_middleware.rb b/lib/gitlab/sidekiq_status/client_middleware.rb index ee12dbbe51a..8471696dcea 100644 --- a/lib/gitlab/sidekiq_status/client_middleware.rb +++ b/lib/gitlab/sidekiq_status/client_middleware.rb @@ -4,13 +4,7 @@ module Gitlab module SidekiqStatus class ClientMiddleware def call(_, job, _, _) - status_expiration = job['status_expiration'] - - unless ::Feature.enabled?(:opt_in_sidekiq_status, default_enabled: :yaml) - status_expiration ||= Gitlab::SidekiqStatus::DEFAULT_EXPIRATION - end - - Gitlab::SidekiqStatus.set(job['jid'], status_expiration) + Gitlab::SidekiqStatus.set(job['jid'], job['status_expiration']) yield end |