diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-31 15:06:08 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-05-31 15:06:08 -0700 |
| commit | 47b60b6cfe681967a3dcf23d398ddef4d77a635c (patch) | |
| tree | 8064cacd41b3fecc772a2e3a1d0f2b6fb3042cfc | |
| parent | 09a80feede104004cc00bcfcf1ed425ae7ef28e1 (diff) | |
| download | gitlab-ce-47b60b6cfe681967a3dcf23d398ddef4d77a635c.tar.gz | |
Make EmailsOnPushWorker use Sidekiq mailers queue
EmailsOnPushWorker was using the default queue, which made it impossible
to prioritize MergeWorker and other key workers with a separate Sidekiq
process.
| -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 fcaf022b416..83bb12665a3 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 = {}) |