summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-07-17 16:38:02 +0100
committerSean McGivern <sean@gitlab.com>2017-07-17 16:38:02 +0100
commitae10151b4234372b4b1ce0f46ecc29b782cec1e0 (patch)
tree16e4914c666f3c9b1035b3da9c3969ef01b8a6bf /app
parent05329d4a364a5c55f2de9546871de1909b6be3f5 (diff)
downloadgitlab-ce-ae10151b4234372b4b1ce0f46ecc29b782cec1e0.tar.gz
Skip dead jobs queue for web hooks and project services31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue
These jobs may legitimately fail because the endpoint just isn't there any more. We don't want them cluttering up the Sidekiq morgue in that case - it's currently full on GitLab.com.
Diffstat (limited to 'app')
-rw-r--r--app/workers/project_service_worker.rb2
-rw-r--r--app/workers/web_hook_worker.rb2
2 files changed, 3 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)