summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-09-10 15:28:58 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-09-10 15:28:58 +0200
commit976eb7a9555e8ffe669148c7026e66f81a147428 (patch)
treef06c93526de4ab56e917c08ae77303bc2a4187c9
parentc091e6cfff8a00eb28e40fd0233e519776b64a24 (diff)
downloadgitlab-ce-976eb7a9555e8ffe669148c7026e66f81a147428.tar.gz
Revert "Delete mailer queue"
-rw-r--r--Procfile2
-rwxr-xr-xbin/background_jobs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Procfile b/Procfile
index c3128a741f1..a5693f8dbc5 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
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,system_hook,project_web_hook,common,default,gitlab_shell
+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell
diff --git a/bin/background_jobs b/bin/background_jobs
index d6576291609..59a51c5c868 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 system_hook -q project_web_hook -q gitlab_shell -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
+ bundle exec sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
}
load_ok()