summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-01 11:07:25 +0000
committerDouwe Maan <douwe@gitlab.com>2016-06-01 11:07:25 +0000
commit9d88a3a1ddf77a2512864df4785bce8f9f566ee1 (patch)
treee12baad43f89fe259b3d57687fa8ed0c9a1ceb0c /app
parent173d83cae98c73fd4af58b62e613c2b629322852 (diff)
parent47b60b6cfe681967a3dcf23d398ddef4d77a635c (diff)
downloadgitlab-ce-9d88a3a1ddf77a2512864df4785bce8f9f566ee1.tar.gz
Merge branch 'emails-on-push-use-sidekiq-mailers' into 'master'
Make EmailsOnPushWorker use Sidekiq mailers queue A customer was having issues with EmailsOnPushWorker clogging the Sidekiq queues and merge requests not being handled quickly. While researching whether it would possible to spin up a separate Sidekiq task just to handle merge requests and other key functions, I found that this worker was using the default Sidekiq queue. Moving to the `mailers` queue makes it possible to de-prioritize this worker and give more weight to the others. See merge request !4390
Diffstat (limited to 'app')
-rw-r--r--app/workers/emails_on_push_worker.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index fa959fc56e3..971f969e25e 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -1,6 +1,7 @@
class EmailsOnPushWorker
include Sidekiq::Worker
+ sidekiq_options queue: :mailers
attr_reader :email, :skip_premailer
def perform(project_id, recipients, push_data, options = {})