debian celerybeat init scrip creates pidfile twice. Closes #434t

catalanojuan · Oct 28, 2011 · cb7442f · cb7442f
1 parent 42649db
commit cb7442f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/celery/bin/base.py b/celery/bin/base.py
@@ -203,7 +203,7 @@ def _get_default_app(self, *args, **kwargs):
         return Celery(*args, **kwargs)
 
 
-def daemon_options(default_pidfile, default_logfile=None):
+def daemon_options(default_pidfile=None, default_logfile=None):
     return (
         Option('-f', '--logfile', default=default_logfile,
                action="store", dest="logfile",

diff --git a/contrib/debian/init.d-deprecated/celerybeat b/contrib/debian/init.d-deprecated/celerybeat
@@ -110,6 +110,9 @@ if [ -n "$2" ]; then
     CELERYBEAT_OPTS="$CELERYBEAT_OPTS $2"
 fi
 
+# Issue #434
+CELERYBEAT_OPTS="$CELERYBEAT_OPTS --pidfile="
+
 # Extra start-stop-daemon options, like user/group.
 if [ -n "$CELERYBEAT_USER" ]; then
     DAEMON_OPTS="$DAEMON_OPTS --chuid $CELERYBEAT_USER"