From a277bff859b13eefe0227755e76529e94ac48e29 Mon Sep 17 00:00:00 2001
From: Leo Maroni <git@em0lar.de>
Date: Tue, 29 Sep 2020 21:38:28 +0200
Subject: [PATCH] Downgrade celery to 4.4.7

see https://github.com/celery/celery/issues/6363
---
 ansible/roles/celerybeat/templates/celerybeat.service.j2 | 4 ++--
 ansible/roles/worker_celery/templates/celeryd.service.j2 | 5 +++--
 requirements.txt                                         | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/celerybeat/templates/celerybeat.service.j2 b/ansible/roles/celerybeat/templates/celerybeat.service.j2
index c435934..f3c8cce 100644
--- a/ansible/roles/celerybeat/templates/celerybeat.service.j2
+++ b/ansible/roles/celerybeat/templates/celerybeat.service.j2
@@ -7,8 +7,8 @@ Type=simple
 User=celery
 Group=celery
 WorkingDirectory={{ fdg_base_path }}/FahrplanDatenGarten
-ExecStart=/bin/sh -c '{{ celery_bin }} beat \
-  -A {{ celery_app }} --pidfile={{ celerybeat_pid_file }} \
+ExecStart=/bin/sh -c '{{ celery_bin }} -A {{ celery_app }}  beat \
+  --pidfile={{ celerybeat_pid_file }} \
   --logfile={{ celerybeat_log_file }} --loglevel={{ celerybeat_log_level }} {{ celerybeat_opts }}'
 
 [Install]
diff --git a/ansible/roles/worker_celery/templates/celeryd.service.j2 b/ansible/roles/worker_celery/templates/celeryd.service.j2
index ac2b478..84fb6cf 100644
--- a/ansible/roles/worker_celery/templates/celeryd.service.j2
+++ b/ansible/roles/worker_celery/templates/celeryd.service.j2
@@ -8,13 +8,14 @@ User=celery
 Group=celery
 Restart=always
 WorkingDirectory={{ fdg_base_path }}/FahrplanDatenGarten
+Environment="CELERY_APP={{ celery_app }}"
 ExecStart=/bin/sh -c '{{ celery_bin }} multi start {{ celeryd_nodes }} \
-  -A {{ celery_app }} --pidfile={{ celeryd_pid_file }} \
+  --pidfile={{ celeryd_pid_file }} \
   --logfile={{ celeryd_log_file }} --loglevel={{ celeryd_log_level }} {{ celeryd_opts }}'
 ExecStop=/bin/sh -c '{{ celery_bin }} multi stopwait {{ celeryd_nodes }} \
   --pidfile={{ celeryd_pid_file }}'
 ExecReload=/bin/sh -c '{{ celery_bin }} multi restart {{ celeryd_nodes }} \
-  -A {{ celery_app }} --pidfile={{ celeryd_pid_file }} \
+  --pidfile={{ celeryd_pid_file }} \
   --logfile={{ celeryd_log_file }} --loglevel={{ celeryd_log_level }} {{ celeryd_opts }}'
 
 [Install]
diff --git a/requirements.txt b/requirements.txt
index 868a8e9..fcc664b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
-django~=3.1.1
+Django~=3.1.1
 requests~=2.24.0
 fdfgen~=0.16.1
 flake8~=3.8.3
 isort~=5.5.3
 pycryptodome~=3.9.8
-celery~=5.0.0
+celery~=4.4.7
 redis~=3.5.3
 pytz==2020.1
 psycopg2-binary~=2.8.6