diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-17 16:58:06 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-17 16:58:06 +0000 |
| commit | 48257533274019eb46f9144e2d90befe1f8e4bca (patch) | |
| tree | 49720fc351303af702dc9fd33ebefd8df3d496ee | |
| parent | 6c26fb353a38f435648fbde46fe3560464d29602 (diff) | |
| parent | ae10151b4234372b4b1ce0f46ecc29b782cec1e0 (diff) | |
| download | gitlab-ce-48257533274019eb46f9144e2d90befe1f8e4bca.tar.gz | |
Merge branch '31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue' into 'master'
Resolve "Don't let webhooks jobs go to the dead jobs queue"
Closes #31571
See merge request !12918
| -rw-r--r-- | app/workers/project_service_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/web_hook_worker.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/workers/project_service_worker.rb b/app/workers/project_service_worker.rb index fdfdeab7b41..4883d848c53 100644 --- a/app/workers/project_service_worker.rb +++ b/app/workers/project_service_worker.rb @@ -2,6 +2,8 @@ class ProjectServiceWorker include Sidekiq::Worker include DedicatedSidekiqQueue + sidekiq_options dead: false + def perform(hook_id, data) data = data.with_indifferent_access Service.find(hook_id).execute(data) diff --git a/app/workers/web_hook_worker.rb b/app/workers/web_hook_worker.rb index ad5ddf02a12..713c0228040 100644 --- a/app/workers/web_hook_worker.rb +++ b/app/workers/web_hook_worker.rb @@ -2,7 +2,7 @@ class WebHookWorker include Sidekiq::Worker include DedicatedSidekiqQueue - sidekiq_options retry: 4 + sidekiq_options retry: 4, dead: false def perform(hook_id, data, hook_name) hook = WebHook.find(hook_id) diff --git a/changelogs/unreleased/31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml b/changelogs/unreleased/31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml new file mode 100644 index 00000000000..69900f0b314 --- /dev/null +++ b/changelogs/unreleased/31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml @@ -0,0 +1,5 @@ +--- +title: Prevent web hook and project service background jobs from going to the dead + jobs queue +merge_request: +author: |