diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 05:45:22 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-12 05:45:22 -0700 |
| commit | 94149f8e7a86e580d9bd47d2a0bbcc6309edc895 (patch) | |
| tree | 43d337f9188d9e4d75cf877705b201fb3b6875fa | |
| parent | d938486c3607dde357bf10f2d31b204290cdfd3f (diff) | |
| parent | ec38d6290c26b6c7ad21d9436627d18402cd3f95 (diff) | |
| download | gitlab-ce-94149f8e7a86e580d9bd47d2a0bbcc6309edc895.tar.gz | |
Merge pull request #4324 from axilleas/initd_script
Removal of gitlab.socket should be in stop function too. Fix #4313
| -rw-r--r-- | lib/support/init.d/gitlab | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index bb0151d9335..2db37ed1c7d 100644 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -20,6 +20,7 @@ APP_USER="git" DAEMON_OPTS="-C $APP_ROOT/config/puma.rb" PID_PATH="$APP_ROOT/tmp/pids" SOCKET_PATH="$APP_ROOT/tmp/sockets" +SOCKET_FILE="$SOCKET_PATH/gitlab.socket" WEB_SERVER_PID="$PID_PATH/puma.pid" SIDEKIQ_PID="$PID_PATH/sidekiq.pid" STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop" @@ -51,7 +52,7 @@ start() { exit 1 else if [ `whoami` = root ]; then - execute "rm -f $SOCKET_PATH/gitlab.socket" + ! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE" execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS" execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" echo "$DESC started" @@ -65,12 +66,13 @@ stop() { if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then ## Program is running, stop it. kill -QUIT `cat $WEB_SERVER_PID` + ! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE" execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" rm "$WEB_SERVER_PID" >> /dev/null echo "$DESC stopped" else ## Program is not running, exit with error. - echo "Error! $DESC not started!" + echo "Error! $DESC is not started!" exit 1 fi } @@ -81,7 +83,7 @@ restart() { if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then echo "Restarting $DESC..." kill -USR2 `cat $WEB_SERVER_PID` - execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" + execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1" if [ `whoami` = root ]; then execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" fi |