diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-22 09:11:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-22 09:11:12 +0000 |
| commit | f896c2eb6064e7d0457859aae3b8f7de3343b275 (patch) | |
| tree | 6856b0bf09a0c66de8e1372a12f589f3640faa61 | |
| parent | 1a923fe02eb3f1b8ec2caca7224682651f2b0bf0 (diff) | |
| parent | 7dbcc1e660b655523cd577a5db4525ddc1aa7414 (diff) | |
| download | gitlab-ce-f896c2eb6064e7d0457859aae3b8f7de3343b275.tar.gz | |
Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
| -rwxr-xr-x | script/background_jobs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/script/background_jobs b/script/background_jobs index e0beb3df815..623e26a2831 100755 --- a/script/background_jobs +++ b/script/background_jobs @@ -8,7 +8,7 @@ gitlab_user=$(ls -l config.ru | awk '{print $3}') 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 |