diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-09-08 14:22:53 +0200 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-09-08 14:22:53 +0200 |
commit | 494d15cfdeb714a439e0536178219fc4928421d5 (patch) | |
tree | b9c2b81a3552b862eaaac950ead99fc3fe86d0cb /bin/background_jobs | |
parent | b712ded13fb63a52500b65b9e0e26bb266f66dd4 (diff) | |
parent | 7dd0646e0d284050ee760c5dfa9ce69beecb9ed6 (diff) | |
download | gitlab-ce-494d15cfdeb714a439e0536178219fc4928421d5.tar.gz |
Merge pull request #7258 from presto53/fix_init_scripts_interpreter
change bash to sh in web, background_jobs scripts
Diffstat (limited to 'bin/background_jobs')
-rwxr-xr-x | bin/background_jobs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/background_jobs b/bin/background_jobs index 71bf6d5e644..b58cdce4f9f 100755 --- a/bin/background_jobs +++ b/bin/background_jobs @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh cd $(dirname $0)/.. app_root=$(pwd) @@ -6,22 +6,22 @@ sidekiq_pidfile="$app_root/tmp/pids/sidekiq.pid" sidekiq_logfile="$app_root/log/sidekiq.log" gitlab_user=$(ls -l config.ru | awk '{print $3}') -function warn +warn() { echo "$@" 1>&2 } -function stop +stop() { bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1 } -function killall +killall() { pkill -u $gitlab_user -f 'sidekiq [0-9]' } -function restart +restart() { if [ -f $sidekiq_pidfile ]; then stop @@ -30,20 +30,20 @@ function restart start_sidekiq -d -L $sidekiq_logfile } -function start_no_deamonize +start_no_deamonize() { start_sidekiq } -function start_sidekiq +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 } -function load_ok +load_ok() { sidekiq_pid=$(cat $sidekiq_pidfile) - if [[ -z $sidekiq_pid ]] ; then + if [ -z $sidekiq_pid ] ; then warn "Could not find a PID in $sidekiq_pidfile" exit 0 fi |