packages: python-celery/celeryd.init - support for --config., --loader and ...

[zbyniu]

Author: zbyniu                       Date: Thu Dec 29 22:00:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- support for --config., --loader and PYTHONPATH

---- Files affected:
packages/python-celery:
   celeryd.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/python-celery/celeryd.init
diff -u packages/python-celery/celeryd.init:1.1 packages/python-celery/celeryd.init:1.2
--- packages/python-celery/celeryd.init:1.1	Thu Jun 16 21:11:20 2011
+++ packages/python-celery/celeryd.init	Thu Dec 29 23:00:42 2011
@@ -36,12 +36,23 @@
 CELERYD_MULTI=${CELERYD_MULTI:-"/usr/bin/celeryd-multi"}
 CELERYD_NODES=${CELERYD_NODES:-$DEFAULT_NODES}
 
-export CELERY_LOADER
-
 if [ -n "$2" ]; then
     CELERYD_OPTS="$CELERYD_OPTS $2"
 fi
 
+if [ -n "$CELERY_PYTHONPATH" ]; then
+    PYTHONPATH=$CELERY_PYTHONPATH
+    export PYTHONPATH
+fi
+
+if [ -n "$CELERY_CONFIG_MODULE" ]; then
+    CELERYD_OPTS="$CELERYD_OPTS --config=$CELERY_CONFIG_MODULE"
+fi
+
+if [ -n "$CELERY_LOADER" ]; then
+    CELERYD_OPTS="$CELERYD_OPTS --loader=$CELERY_LOADER"
+fi
+
 # Extra start-stop-daemon options, like user/group.
 if [ -n "$CELERYD_CHDIR" ]; then
     DAEMON_OPTS="$DAEMON_OPTS --chdir $CELERYD_CHDIR"
@@ -65,7 +76,6 @@
 		--make-pidfile --pidfile "$CELERYD_PID_FILE" \
 		--exec $CELERYD -- \
 		--logfile="$CELERYD_LOG_FILE" --loglevel="$CELERYD_LOG_LEVEL" \
-		--config="$CELERY_CONFIG_MODULE" \
 		$CELERYD_OPTS
 	ok
 	RETVAL=$?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-celery/celeryd.init?r1=1.1&r2=1.2&f=u