diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-12-04 14:48:32 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-12-04 14:48:32 +0300 |
| commit | 0c377a79d45e71a054e07ec20c502643591d0181 (patch) | |
| tree | 733a8e0a2825dcd56099b0442f5e4522c0d3dfb1 | |
| parent | abf54f230ef7ff80c0ca1baa6a3c4c3d0cbb7869 (diff) | |
| parent | 9ce8c867eeb5da53eb76bc01ef7eaef5c798243c (diff) | |
Merge branch 'fix_mailer_queue' into 'master'
Fix mailers queue
The `mailer` queue can be removed.
See merge request !1975
| -rw-r--r-- | Procfile | 2 | ||||
| -rwxr-xr-x | bin/background_jobs | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3,5 +3,5 @@ # lib/support/init.d, which call scripts in bin/ . # web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"} -worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q mailers -q default +worker: bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default # mail_room: bundle exec mail_room -q -c config/mail_room.yml diff --git a/bin/background_jobs b/bin/background_jobs index d4578f6a222..5c85fb339e6 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -37,7 +37,7 @@ start_no_deamonize() start_sidekiq() { - bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 + bundle exec sidekiq -q post_receive -q mailers -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1 } load_ok() |