diff options
| 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 |
| commit | 5490bb8983004ba43a946ba1f3dbcf14c9254439 (patch) | |
| tree | 446a4ae5fbb20313697a9fb0ba36d717a78a49d5 | |
| parent | 528bf392944ef1f37bec41136016de585ef885c8 (diff) | |
| download | Ishtar-5490bb8983004ba43a946ba1f3dbcf14c9254439.tar.bz2 Ishtar-5490bb8983004ba43a946ba1f3dbcf14c9254439.zip | |
Celery: fix extra_settings import
| -rw-r--r-- | example_project/celery_app.py.sample | 2 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 5 |
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) |