Skip to content
Snippets Groups Projects
Commit f896c2eb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable

parents 1a923fe0 7dbcc1e6
No related branches found
No related tags found
2 merge requests!100176 2 stable,!6886DELETE THIS MERGE REQUEST
This commit is part of merge request !10017. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
script/background_jobs
+ 2
− 2
Edit View file @ f896c2eb
@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk '{print $3}')
@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk '{print $3}')
   
function stop function stop
{ {
bundle exec sidekiqctl stop $sidekiq_pidfile &>> $sidekiq_logfile bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
} }
   
function killall function killall
@@ -32,7 +32,7 @@ function start_no_deamonize
@@ -32,7 +32,7 @@ function start_no_deamonize
   
function start_sidekiq function start_sidekiq
{ {
bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e $RAILS_ENV -P $sidekiq_pidfile $@ &>> $sidekiq_logfile bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
} }
   
case "$1" in case "$1" in
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment