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

Dmitriy Zaporozhets
2 parents 1a923fe0 7dbcc1e6
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
script/background_jobs
@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk &#39;{print $3}&#39;)
  
 function stop
 {
-  bundle exec sidekiqctl stop $sidekiq_pidfile &>> $sidekiq_logfile
+  bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
 }
  
 function killall
@@ -32,7 +32,7 @@ function start_no_deamonize
  
 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
...	...	@@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru \| awk '{print $3}')
8	8
9	9	function stop
10	10	{
11		- bundle exec sidekiqctl stop $sidekiq_pidfile &>> $sidekiq_logfile
	11	+ bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
12	12	}
13	13
14	14	function killall
...	...	@@ -32,7 +32,7 @@ function start_no_deamonize
32	32
33	33	function start_sidekiq
34	34	{
35		- bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e $RAILS_ENV -P $sidekiq_pidfile $@ &>> $sidekiq_logfile
	35	+ 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
36	36	}
37	37
38	38	case "$1" in
...	...