From 0fe00fd10606d67c07788725b647e26c3639d64b Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Thu, 21 Feb 2013 06:55:49 +0000
Subject: [PATCH] dont run cron tasks in encoding queue, can only have one
 instance, cron jobs are executed several times otherwise

---
 etc/init/pandora-cron.conf     | 24 ++++++++++++++++++++++++
 etc/init/pandora-encoding.conf |  1 -
 reload.sh                      |  7 ++++---
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 etc/init/pandora-cron.conf

diff --git a/etc/init/pandora-cron.conf b/etc/init/pandora-cron.conf
new file mode 100644
index 00000000..bd3cc9f6
--- /dev/null
+++ b/etc/init/pandora-cron.conf
@@ -0,0 +1,24 @@
+# pandora cron daemon
+#
+
+description	"pandora cron daemon"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+env VENV=/srv/pandora
+env USER=pandora
+env HOME=/home/pandora
+
+script
+test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var/log/pandora)
+test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
+cd $VENV/pandora
+exec /usr/bin/sudo -u $USER $VENV/bin/python $VENV/pandora/manage.py celerybeat \
+                   -s /var/run/pandora/celerybeat-schedule \
+                   --pidfile /var/run/pandora/pandora-cron.pid \
+                   -f /var/log/pandora/pandora-cron.log \
+                   -l INFO
+end script
diff --git a/etc/init/pandora-encoding.conf b/etc/init/pandora-encoding.conf
index c14c1ab0..167c9b80 100644
--- a/etc/init/pandora-encoding.conf
+++ b/etc/init/pandora-encoding.conf
@@ -17,7 +17,6 @@ test -e /var/log/pandora || (mkdir -p /var/log/pandora && chown $USER:$USER /var
 test -e /var/run/pandora || (mkdir -p /var/run/pandora && chown $USER:$USER /var/run/pandora)
 cd $VENV/pandora
 exec /usr/bin/sudo -u $USER $VENV/bin/python $VENV/pandora/manage.py celeryd \
-                   -B -s /var/run/pandora/celerybeat-schedule \
                    -Q encoding \
                    -n pandora-encoding \
                    --pidfile /var/run/pandora/pandora-encoding.pid \
diff --git a/reload.sh b/reload.sh
index e5f9ee25..7db803f8 100755
--- a/reload.sh
+++ b/reload.sh
@@ -1,3 +1,4 @@
-service pandora reload
-service pandora-tasks reload
-service pandora-encoding reload
+#!/bin/sh
+for service in pandora pandora-tasks pandora-encoding pandora-cron; do
+    service $service reload
+done