summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorling.su <unaheidi@gmail.com>2014-07-04 10:51:44 +0800
committerling.su <unaheidi@gmail.com>2014-07-04 10:51:44 +0800
commit9c2b046454ff68fe861bcd8fb81661c9c7753ef2 (patch)
tree7abf1558af6627e2264b8a52332b302e53a98988
parent83fd03f2ddb6b2fb2088bb9b3945fe13afb91320 (diff)
downloadgitlab-ce-9c2b046454ff68fe861bcd8fb81661c9c7753ef2.tar.gz
Delete mailer queue because we don't use sidekiq_mailer gem and now the mailer queue doesn't exist any more.
-rw-r--r--Procfile2
-rwxr-xr-xbin/background_jobs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Procfile b/Procfile
index a5693f8dbc5..c3128a741f1 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,mailer,system_hook,project_web_hook,common,default,gitlab_shell
+worker: bundle exec sidekiq -q post_receive,system_hook,project_web_hook,common,default,gitlab_shell
diff --git a/bin/background_jobs b/bin/background_jobs
index c7ba4398cfb..71bf6d5e644 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -37,7 +37,7 @@ function start_no_deamonize
function start_sidekiq
{
- 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
+ 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
}
function load_ok