summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-15 19:49:36 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-15 19:49:36 +0200
commit5fdcbedab4ea8ea42f60af275aff30d29a84d3e8 (patch)
treead9b600ba62157d8dbe493ba4546680b6157ed08
parent2e2e0522d4777b457edb207758cb18520c6930fe (diff)
downloadgitlab-ce-5fdcbedab4ea8ea42f60af275aff30d29a84d3e8.tar.gz
add resque to gitlab service
-rw-r--r--doc/installation.md9
-rwxr-xr-xresque.sh2
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/installation.md b/doc/installation.md
index 95249abc47b..c16fc4c9c67 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 84a1066f087..d8b68d463f0 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