diff --git a/doc/installation.md b/doc/installation.md index 95249abc47bab7d5b0a924ef2cfc8c7660dc9cbc..c16fc4c9c67e1755b9a78f351bda3658fb61d386 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -256,33 +256,38 @@ Create init script in /etc/init.d/gitlab: NAME=unicorn DESC="Gitlab service" PID=/home/gitlab/gitlab/tmp/pids/unicorn.pid + RESQUE_PID=/home/gitlab/gitlab/tmp/pids/resque_worker.pid case "$1" in start) CD_TO_APP_DIR="cd /home/gitlab/gitlab" START_DAEMON_PROCESS="bundle exec unicorn_rails $DAEMON_OPTS" + START_RESQUE_PROCESS="bundle exec unicorn_rails $DAEMON_OPTS" echo -n "Starting $DESC: " if [ `whoami` = root ]; then - sudo -u gitlab sh -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS" + sudo -u gitlab sh -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS && START_RESQUE_PROCESS" else - $CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS + $CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS && $START_RESQUE_PROCESS fi echo "$NAME." ;; stop) echo -n "Stopping $DESC: " kill -QUIT `cat $PID` + kill -QUIT `cat $RESQUE_PID` echo "$NAME." ;; restart) echo -n "Restarting $DESC: " kill -USR2 `cat $PID` + kill -USR2 `cat $RESQUE_PID` echo "$NAME." ;; reload) echo -n "Reloading $DESC configuration: " kill -HUP `cat $PID` + kill -HUP `cat $RESQUE_PID` echo "$NAME." ;; *) diff --git a/resque.sh b/resque.sh index 84a1066f087261d6cb3af5e19f69a63f0d50391e..d8b68d463f0e43a9ca8be88758ff29bdc3e96e7a 100755 --- a/resque.sh +++ b/resque.sh @@ -1,2 +1,2 @@ mkdir tmp/pids -nohup bundle exec rake environment resque:work QUEUE=* RAILS_ENV=production PIDFILE=tmp/pids/resque_worker_QUEUE.pid & >> log/resque_worker_QUEUE.log 2>&1 +nohup bundle exec rake environment resque:work QUEUE=* RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid & >> log/resque_worker.log 2>&1