diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-01 11:07:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-01 11:07:25 +0000 |
| commit | 9d88a3a1ddf77a2512864df4785bce8f9f566ee1 (patch) | |
| tree | e12baad43f89fe259b3d57687fa8ed0c9a1ceb0c | |
| parent | 173d83cae98c73fd4af58b62e613c2b629322852 (diff) | |
| parent | 47b60b6cfe681967a3dcf23d398ddef4d77a635c (diff) | |
| download | gitlab-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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index dd1e5eea8d4..e1af492eb62 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.9.0 (unreleased) - Allow enabling wiki page events from Webhook management UI + - Make EmailsOnPushWorker use Sidekiq mailers queue - Fix wiki page events' webhook to point to the wiki repository - Allow forking projects with restricted visibility level - Improve note validation to prevent errors when creating invalid note via API 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 = {}) |