From 03636a9dbe3173d2d6b6a4fe3bfb169deb8f5021 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 14 Aug 2018 23:09:11 +0100 Subject: [PATCH 1/3] Set a default value for CELERY_BROKER_URL when docker usn't used - fixes #1741 --- {{cookiecutter.project_slug}}/config/settings/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index e4ab28844..1261f03b5 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -233,7 +233,12 @@ if USE_TZ: # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-timezone CELERY_TIMEZONE = TIME_ZONE # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url +{% if cookiecutter.use_docker == 'y' -%} CELERY_BROKER_URL = env('CELERY_BROKER_URL') +{%- else %} +CELERY_BROKER_URL = env('CELERY_BROKER_URL', default="redis://localhost:6379") +{%- endif %} + # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = CELERY_BROKER_URL # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-accept_content From 01fca91e266f0af5a3604a85a5014528f2349330 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 15 Aug 2018 10:42:54 +0100 Subject: [PATCH 2/3] Better default value for CELERY_BROKER_URL with Docker --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 1261f03b5..51bf2d308 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -234,7 +234,7 @@ if USE_TZ: CELERY_TIMEZONE = TIME_ZONE # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url {% if cookiecutter.use_docker == 'y' -%} -CELERY_BROKER_URL = env('CELERY_BROKER_URL') +CELERY_BROKER_URL = env('CELERY_BROKER_URL', default="redis://redis:6379/0") {%- else %} CELERY_BROKER_URL = env('CELERY_BROKER_URL', default="redis://localhost:6379") {%- endif %} From a727303965b7c62216cf32108285fb9a81b9fdcd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 15 Aug 2018 14:55:37 +0100 Subject: [PATCH 3/3] Revert "Better default value for CELERY_BROKER_URL with Docker" This reverts commit 01fca91 --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 51bf2d308..1261f03b5 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -234,7 +234,7 @@ if USE_TZ: CELERY_TIMEZONE = TIME_ZONE # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url {% if cookiecutter.use_docker == 'y' -%} -CELERY_BROKER_URL = env('CELERY_BROKER_URL', default="redis://redis:6379/0") +CELERY_BROKER_URL = env('CELERY_BROKER_URL') {%- else %} CELERY_BROKER_URL = env('CELERY_BROKER_URL', default="redis://localhost:6379") {%- endif %}