Fixed LOG_LEVEL/LOGLEVEL confusion

contrib/debian/init.d/celerybeat

@@ -51,10 +51,10 @@
 #       Additional arguments to celerybeat, see ``celerybeat --help`` for a
 #       list.
 #
-#   * CELERYBEAT_PIDFILE
+#   * CELERYBEAT_PID_FILE
 #       Full path to the pidfile. Default is /var/run/celeryd.pid.
 #
-#   * CELERYBEAT_LOGFILE
+#   * CELERYBEAT_LOG_FILE
 #       Full path to the celeryd logfile. Default is /var/log/celeryd.log
 #
 #   * CELERYBEAT_LOG_LEVEL

contrib/debian/init.d/celeryd

@@ -46,10 +46,10 @@
 #   * CELERYD_CHDIR
 #       Path to chdir at start. Default is to stay in the current directory.
 #
-#   * CELERYD_PIDFILE
+#   * CELERYD_PID_FILE
 #       Full path to the pidfile. Default is /var/run/celeryd.pid.
 #
-#   * CELERYD_LOGFILE
+#   * CELERYD_LOG_FILE
 #       Full path to the celeryd logfile. Default is /var/log/celeryd.log
 #
 #   * CELERYD_LOG_LEVEL
@@ -77,7 +77,6 @@
 
 set -e
 
-CELERYD_LOG_LEVEL="INFO"
 DEFAULT_CELERYD="/usr/bin/celeryd"
 
 # /etc/init.d/ssh: start and stop the celery task worker daemon.
@@ -88,6 +87,7 @@ fi
 
 CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-${CELERYD_LOGFILE:-"/var/log/celeryd.log"}}
 CELERYD_PID_FILE=${CELERYD_PID_FILE:-${CELERYD_PIDFILE:-"/var/run/celeryd.pid"}}
+CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-"INFO"}}
 
 CELERYD=${CELERYD:-$DEFAULT_CELERYD}
 

contrib/debian/init.d/celeryevcam

@@ -52,10 +52,10 @@
 #   * CELERYD_CHDIR
 #       Path to chdir at start. Default is to stay in the current directory.
 #
-#   * CELERYEV_PIDFILE
+#   * CELERYEV_PID_FILE
 #       Full path to the pidfile. Default is /var/run/celeryd.pid.
 #
-#   * CELERYEV_LOGFILE
+#   * CELERYEV_LOG_FILE
 #       Full path to the celeryd logfile. Default is /var/log/celeryd.log
 #
 #   * CELERYEV_LOG_LEVEL
@@ -83,9 +83,9 @@
 
 set -e
 
-CELERYEV_PID_FILE="/var/run/celeryev.pid"
-CELERYEV_LOG_FILE="/var/log/celeryev.log"
-CELERYEV_LOG_LEVEL="INFO"
+DEFAULT_PID_FILE="/var/run/celeryev.pid"
+DEFAULT_LOG_FILE="/var/log/celeryev.log"
+DEFAULT_LOG_LEVEL="INFO"
 DEFAULT_CELERYEV="/usr/bin/celeryev"
 
 if test -f /etc/default/celeryd; then
@@ -97,6 +97,9 @@ if test -f /etc/default/celeryev; then
 fi
 
 CELERYEV=${CELERYEV:-$DEFAULT_CELERYEV}
+CELERYEV_PID_FILE=${CELERYEV_PID_FILE:-${CELERYEV_PIDFILE:-$DEFAULT_PID_FILE}}
+CELERYEV_LOG_FILE=${CELERYEV_LOG_FILE:-${CELERYEV_LOGFILE:-$DEFAULT_LOG_FILE}}
+CELERYEV_LOG_LEVEL=${CELERYEV_LOG_LEVEL:-${CELERYEV_LOG_LEVEL:-$DEFAULT_LOG_LEVEL}}
 
 export CELERY_LOADER