diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 22:15:03 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 22:15:03 +0300 |
commit | dbd88c02d6d2e4cb8af5347dd8e7b3ae63079a9d (patch) | |
tree | 479feae90b06a0063454e810b7e02228212baa01 /lib/gitlab/sidekiq_middleware | |
parent | 8d17c4dae6b4662dddffe9e2ddca8100e8cd3d0b (diff) |
Put cancelled job in DeadSet
This replicates Sidekiq behavior
of pushing dead job into DeadSet.
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
-rw-r--r-- | lib/gitlab/sidekiq_middleware/monitor.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware/monitor.rb b/lib/gitlab/sidekiq_middleware/monitor.rb index 0d88fe760d3..53a6132edac 100644 --- a/lib/gitlab/sidekiq_middleware/monitor.rb +++ b/lib/gitlab/sidekiq_middleware/monitor.rb @@ -8,8 +8,12 @@ module Gitlab yield end rescue Gitlab::SidekiqMonitor::CancelledError + # push job to DeadSet + payload = ::Sidekiq.dump_json(job) + ::Sidekiq::DeadSet.new.kill(payload, notify_failure: false) + # ignore retries - raise Sidekiq::JobRetry::Skip + raise ::Sidekiq::JobRetry::Skip end end end |