move celery into app

2019-07-16 12:27:35 +01:00 · 2019-07-16 12:27:35 +01:00 · ee86c9ab9f
parent 46621522b1
commit ee86c9ab9f
3 changed files with 4 additions and 3 deletions
--- a/etc/systemd/system/pandora-encoding.service
+++ b/etc/systemd/system/pandora-encoding.service
@ -8,9 +8,9 @@ Restart=always
 User=pandora
 Group=pandora
 PIDFile=/run/pandora/encoding.pid
-WorkingDirectory=/srv/pandora
+WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
-    -A pandora worker \
+    -A app worker \
    -Q encoding -n pandora-encoding \
    --pidfile /run/pandora/encoding.pid \
    --maxtasksperchild 500 \
--- a/etc/systemd/system/pandora-tasks.service
+++ b/etc/systemd/system/pandora-tasks.service
@ -10,7 +10,7 @@ Group=pandora
 PIDFile=/run/pandora/tasks.pid
 WorkingDirectory=/srv/pandora/pandora
 ExecStart=/srv/pandora/bin/celery \
-    -A pandora worker \
+    -A app worker \
    -Q default,celery -n pandora-default \
    --pidfile /run/pandora/tasks.pid \
    --maxtasksperchild 1000 \
--- a/pandora/app/celery.py
+++ b/pandora/app/celery.py
@ -3,6 +3,7 @@ import os
 from celery import Celery

 root_dir = os.path.normpath(os.path.abspath(os.path.dirname(__file__)))
+root_dir = os.path.dirname(root_dir)
 os.chdir(root_dir)

 # set the default Django settings module for the 'celery' program.