Browse Source

if using django w/ virtualenv dont modify CELERYD

The celeryd executable defined by CELERYD/CELERYBEAT doesn't need
modified.  For django it's still $DJANGO_PROJECT_DIR/manage.py.
Andrew Watts 15 năm trước cách đây
mục cha
commit
7bba1ed879
2 tập tin đã thay đổi với 6 bổ sung2 xóa
  1. 3 1
      contrib/debian/init.d/celerybeat
  2. 3 1
      contrib/debian/init.d/celeryd

+ 3 - 1
contrib/debian/init.d/celerybeat

@@ -88,7 +88,9 @@ check_dev_null() {
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 if [ ! -z "$VIRTUALENV" ]; then
     export PATH="$VIRTUALENV/bin:$PATH"
-    CELERYBEAT="$VIRTUALENV/bin/$CELERYBEAT"
+    if [ -z "$DJANGO_PROJECT_DIR" ]; then
+        CELERYBEAT="$VIRTUALENV/bin/$CELERYBEAT"
+    fi
 fi
 
 if [ -f "$CELERYBEAT" && ! -x "$CELERYBEAT" ]; then

+ 3 - 1
contrib/debian/init.d/celeryd

@@ -83,7 +83,9 @@ check_dev_null() {
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 if [ ! -z "$VIRTUALENV" ]; then
     export PATH="$VIRTUALENV/bin:$PATH"
-    CELERYD="$VIRTUALENV/bin/$CELERYD"
+    if [ -z "$DJANGO_PROJECT_DIR" ]; then
+    	CELERYD="$VIRTUALENV/bin/$CELERYD"
+    fi
 fi