diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-27 18:57:19 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-27 18:57:19 +0100 |
| commit | 8d973d6ecd7821d2634c72c34d86a3526f143c91 (patch) | |
| tree | e41d35ce909ff5c16ee3c08e3bb9a65116bdeac4 /lib/support | |
| parent | bbadbf183a77ec8d151ce0cf93bd78f1eb0ce539 (diff) | |
| download | gitlab-ci-8d973d6ecd7821d2634c72c34d86a3526f143c91.tar.gz | |
No backgrounding in the init script
Diffstat (limited to 'lib/support')
| -rw-r--r-- | lib/support/init.d/gitlab_ci | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/support/init.d/gitlab_ci b/lib/support/init.d/gitlab_ci index cb05054..a55d9ce 100644 --- a/lib/support/init.d/gitlab_ci +++ b/lib/support/init.d/gitlab_ci @@ -49,7 +49,7 @@ start() { if [ `whoami` = root ]; then ! [ -e $SOCKET_FILE ] || sudo -u $APP_USER -H bash -l -c "rm $SOCKET_FILE" sudo -u $APP_USER -H bash -l -c "RAILS_ENV=production bundle exec puma $DAEMON_OPTS" - sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" + sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1" echo "$DESC started" fi fi @@ -61,7 +61,7 @@ stop() { if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then ## Program is running, stop it. kill -QUIT `cat $WEB_SERVER_PID` - sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" + sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1" rm "$WEB_SERVER_PID" >> /dev/null echo "$DESC stopped" else @@ -77,9 +77,9 @@ restart() { if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then echo "Restarting $DESC..." kill -USR2 `cat $WEB_SERVER_PID` - sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" + sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1" if [ `whoami` = root ]; then - sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" + sudo -u $APP_USER -H bash -l -c "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1" fi echo "$DESC restarted." else |