Merge branch 'DXist/feature/fix_init_scripts'

extra/generic-init.d/celeryd

@@ -37,14 +37,10 @@
 # making it easy to run multiple processes on the system.
 SCRIPT_NAME="$(basename $0)"
 
-# some commands work asyncronously, so we'll wait this many seconds
-SLEEP_SECONDS=5
-
-DEFAULT_PID_FILE="/var/run/celery/${SCRIPT_NAME}-%N.pid"
-DEFAULT_LOG_FILE="/var/log/celery/${SCRIPT_NAME}-%N.log"
+DEFAULT_PID_FILE="/var/run/celery/${SCRIPT_NAME}/%n.pid"
+DEFAULT_LOG_FILE="/var/log/celery/${SCRIPT_NAME}/%n.log"
 DEFAULT_LOG_LEVEL="INFO"
 DEFAULT_NODES="celery"
-DEFAULT_CELERYD="-m celery worker --detach"
 
 CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
 
@@ -73,7 +69,6 @@ fi
 CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
 CELERY_BIN=${CELERY_BIN:-"celery"}
 CELERYD_MULTI=${CELERYD_MULTI:-"$CELERY_BIN multi"}
-CELERYD=${CELERYD:-$DEFAULT_CELERYD}
 CELERYD_NODES=${CELERYD_NODES:-$DEFAULT_NODES}
 
 export CELERY_LOADER
@@ -187,7 +182,6 @@ _get_worker_pids() {
 
 stop_workers () {
     $CELERYD_MULTI stopwait $CELERYD_NODES --pidfile="$CELERYD_PID_FILE"
-    sleep $SLEEP_SECONDS
 }
 
 
@@ -196,10 +190,8 @@ start_workers () {
                          --pidfile="$CELERYD_PID_FILE"      \
                          --logfile="$CELERYD_LOG_FILE"      \
                          --loglevel="$CELERYD_LOG_LEVEL"    \
-                         --cmd="$CELERYD"                   \
                          $CELERY_APP_ARG                    \
                          $CELERYD_OPTS
-    sleep $SLEEP_SECONDS
 }
 
 
@@ -208,10 +200,8 @@ restart_workers () {
                            --pidfile="$CELERYD_PID_FILE"    \
                            --logfile="$CELERYD_LOG_FILE"    \
                            --loglevel="$CELERYD_LOG_LEVEL"  \
-                           --cmd="$CELERYD"                 \
                            $CELERY_APP_ARG                  \
                            $CELERYD_OPTS
-    sleep $SLEEP_SECONDS
 }
 
 restart_workers_graceful () {