diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 13:03:42 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 14:21:55 +0300 |
| commit | 8d17c4dae6b4662dddffe9e2ddca8100e8cd3d0b (patch) | |
| tree | f13731d3bdb703e868517403afd83f92d965ea7e /lib/gitlab/sidekiq_middleware | |
| parent | cb193cd6b54ee9ac0cf87650100585293540abfa (diff) | |
Properly handle `sidekiq` skip
Transform `CancelledError` into `JobRetry::Skip`
Diffstat (limited to 'lib/gitlab/sidekiq_middleware')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/monitor.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_middleware/monitor.rb b/lib/gitlab/sidekiq_middleware/monitor.rb index 2d0e5a6d635..0d88fe760d3 100644 --- a/lib/gitlab/sidekiq_middleware/monitor.rb +++ b/lib/gitlab/sidekiq_middleware/monitor.rb @@ -7,6 +7,9 @@ module Gitlab Gitlab::SidekiqMonitor.instance.within_job(job['jid'], queue) do yield end + rescue Gitlab::SidekiqMonitor::CancelledError + # ignore retries + raise Sidekiq::JobRetry::Skip end end end |