From f29f108e4983b35ec24f70b1956d1ad00073feee Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 15 Mar 2019 18:57:45 +0100
Subject: Celery: manage cached_label update with tasks

---
 example_project/__init__.py.celery.sample |  2 +-
 example_project/celery.py.sample          | 18 ------------------
 example_project/celery_app.py.sample      | 18 ++++++++++++++++++
 example_project/settings.py               |  7 +++++--
 4 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 example_project/celery.py.sample
 create mode 100644 example_project/celery_app.py.sample

(limited to 'example_project')

diff --git a/example_project/__init__.py.celery.sample b/example_project/__init__.py.celery.sample
index ebae6a3c3..5dad2ced8 100644
--- a/example_project/__init__.py.celery.sample
+++ b/example_project/__init__.py.celery.sample
@@ -1,7 +1,7 @@
 # force the retranslation of generated strings and external module
 from django.utils.translation import ugettext_lazy as _
 
-from .celery import app as celery_app
+from .celery_app import app as celery_app
 
 __all__ = ('celery_app',)
 
diff --git a/example_project/celery.py.sample b/example_project/celery.py.sample
deleted file mode 100644
index 3aed98038..000000000
--- a/example_project/celery.py.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-import os
-from celery import Celery
-
-# change example_project with your project name
-project_name = "example_project"
-
-# set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', project_name + '.settings')
-
-app = Celery(project_name)
-
-app.config_from_object('django.conf:settings', namespace='CELERY')
-app.autodiscover_tasks()
-
-
-@app.task(bind=True)
-def debug_task(self):
-    print('Request: {0!r}'.format(self.request))
\ No newline at end of file
diff --git a/example_project/celery_app.py.sample b/example_project/celery_app.py.sample
new file mode 100644
index 000000000..3aed98038
--- /dev/null
+++ b/example_project/celery_app.py.sample
@@ -0,0 +1,18 @@
+import os
+from celery import Celery
+
+# change example_project with your project name
+project_name = "example_project"
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', project_name + '.settings')
+
+app = Celery(project_name)
+
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.autodiscover_tasks()
+
+
+@app.task(bind=True)
+def debug_task(self):
+    print('Request: {0!r}'.format(self.request))
\ No newline at end of file
diff --git a/example_project/settings.py b/example_project/settings.py
index 09590f807..bf2b26c31 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -273,9 +273,12 @@ DOT_BINARY = ""
 TEST_RUNNER = 'ishtar_common.tests.ManagedModelTestRunner'
 
 try:
-    from .local_settings import *
+    from local_settings import *
 except ImportError as e:
-    print('Unable to load local_settings.py:', e)
+    try:
+        from .local_settings import *
+    except ImportError as e:
+        print('Unable to load local_settings.py:', e)
 
 if LANGUAGE_CODE == "fr-fr" and SRID == 4326:
     SRID = 27572  # Lambert zone II - France
-- 
cgit v1.2.3