|
@@ -9,16 +9,8 @@
|
|
|
# Short-Description: celery task worker daemon
|
|
|
### END INIT INFO
|
|
|
|
|
|
-# To use this with Django set your DJANGO_PROJECT_DIR in /etc/default/celeryd:
|
|
|
-#
|
|
|
-# echo "DJANGO_PROJECT_DIR=/opt/Myapp" > /etc/default/celeryd
|
|
|
-#
|
|
|
-# The django project dir is the directory that contains settings and
|
|
|
-# manage.py.
|
|
|
-
|
|
|
set -e
|
|
|
|
|
|
-DJANGO_SETTINGS_MODULE=settings
|
|
|
CELERYD_PID_FILE="/var/run/celeryd.pid"
|
|
|
CELERYD_LOG_FILE="/var/log/celeryd.log"
|
|
|
CELERYD_LOG_LEVEL="INFO"
|
|
@@ -30,22 +22,10 @@ if test -f /etc/default/celeryd; then
|
|
|
. /etc/default/celeryd
|
|
|
fi
|
|
|
|
|
|
-export DJANGO_SETTINGS_MODULE
|
|
|
-export DJANGO_PROJECT_DIR
|
|
|
-
|
|
|
-if [ -z "$CELERYD" ]; then
|
|
|
- if [ ! -z "$DJANGO_PROJECT_DIR" ]; then
|
|
|
- CELERYD="$DJANGO_PROJECT_DIR/manage.py"
|
|
|
- CELERYD_OPTS="celeryd $CELERYD_OPTS"
|
|
|
- else
|
|
|
- CELERYD=$DEFAULT_CELERYD
|
|
|
- fi
|
|
|
-fi
|
|
|
+export CELERY_LOADER
|
|
|
|
|
|
. /lib/lsb/init-functions
|
|
|
|
|
|
-cd $DJANGO_PROJECT_DIR
|
|
|
-
|
|
|
CELERYD_OPTS="$CELERYD_OPTS -f $CELERYD_LOG_FILE -l $CELERYD_LOG_LEVEL"
|
|
|
|
|
|
if [ -n "$2" ]; then
|
|
@@ -83,9 +63,7 @@ check_dev_null() {
|
|
|
export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
|
|
|
if [ ! -z "$VIRTUALENV" ]; then
|
|
|
export PATH="$VIRTUALENV/bin:$PATH"
|
|
|
- if [ -z "$DJANGO_PROJECT_DIR" ]; then
|
|
|
- CELERYD="$VIRTUALENV/bin/$CELERYD"
|
|
|
- fi
|
|
|
+ CELERYD="$VIRTUALENV/bin/$CELERYD"
|
|
|
fi
|
|
|
|
|
|
|
|
@@ -102,7 +80,7 @@ case "$1" in
|
|
|
start)
|
|
|
check_dev_null
|
|
|
log_daemon_msg "Starting celery task worker server" "celeryd"
|
|
|
- if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --chdir $DJANGO_PROJECT_DIR --make-pidfile --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then
|
|
|
+ if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --make-pidfile --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then
|
|
|
log_end_msg 0
|
|
|
else
|
|
|
log_end_msg 1
|
|
@@ -124,7 +102,7 @@ case "$1" in
|
|
|
log_daemon_msg "Restarting celery task worker server" "celeryd"
|
|
|
start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $CELERYD_PID_FILE
|
|
|
check_dev_null log_end_msg
|
|
|
- if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --chdir $DJANGO_PROJECT_DIR --make-pidfile --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then log_end_msg 0
|
|
|
+ if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --make-pidfile --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then log_end_msg 0
|
|
|
else
|
|
|
log_end_msg 1
|
|
|
fi
|
|
@@ -140,7 +118,7 @@ case "$1" in
|
|
|
0)
|
|
|
# old daemon stopped
|
|
|
check_dev_null log_end_msg
|
|
|
- if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --make-pidfile --chdir $DJANGO_PROJECT_DIR --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then
|
|
|
+ if start-stop-daemon --start $DAEMON_OPTS --quiet --oknodo --background --make-pidfile --pidfile $CELERYD_PID_FILE --exec $CELERYD -- $CELERYD_OPTS; then
|
|
|
log_end_msg 0
|
|
|
else
|
|
|
log_end_msg 1
|