summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-02-16 17:34:25 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-02-16 17:34:25 +0100
commitb805e19e3e549dfd05baa7de2ed5da4c543da47b (patch)
tree446a4ae5fbb20313697a9fb0ba36d717a78a49d5
parent5f7daac6e37d925c46ee282d2c2f2f8f641cb6e9 (diff)
downloadIshtar-b805e19e3e549dfd05baa7de2ed5da4c543da47b.tar.bz2
Ishtar-b805e19e3e549dfd05baa7de2ed5da4c543da47b.zip
Celery: fix extra_settings import
-rw-r--r--example_project/celery_app.py.sample2
-rw-r--r--install/local_settings.py.sample5
2 files changed, 4 insertions, 3 deletions
diff --git a/example_project/celery_app.py.sample b/example_project/celery_app.py.sample
index 30ad27c78..81000bc14 100644
--- a/example_project/celery_app.py.sample
+++ b/example_project/celery_app.py.sample
@@ -1,6 +1,5 @@
import os
from celery import Celery
-import importlib
# change example_project with your project name
@@ -8,7 +7,6 @@ project_name = "example_project"
# set the default Django settings module for the 'celery' program.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', project_name + '.settings')
-importlib.import_module(project_name + '.settings')
app = Celery(project_name)
diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample
index aecad17a6..7c6bac348 100644
--- a/install/local_settings.py.sample
+++ b/install/local_settings.py.sample
@@ -39,4 +39,7 @@ DATABASES = {
try:
from extra_settings import *
except ImportError as e:
- print('Unable to load extra_settings.py:', e)
+ try:
+ from .extra_settings import * # relative import for celery
+ except ImportError as e:
+ print('Unable to load extra_settings.py:', e)