From 76a207d8dae65ed67ac59889d968b7841e11f260 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Thu, 6 Aug 2015 11:21:08 -0700 Subject: [PATCH] Oops - revert celery defaults change, separate PR --- {{cookiecutter.repo_name}}/config/settings/common.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py index cc6faece..22d3d084 100644 --- a/{{cookiecutter.repo_name}}/config/settings/common.py +++ b/{{cookiecutter.repo_name}}/config/settings/common.py @@ -256,14 +256,11 @@ LOGGING = { } } {% if cookiecutter.use_celery == "y" %} -# ######### CELERY +########## CELERY INSTALLED_APPS += ('{{cookiecutter.repo_name}}.taskapp.celery.CeleryConfig',) # if you are not using the django database broker (e.g. rabbitmq, redis, memcached), you can remove the next line. INSTALLED_APPS += ('kombu.transport.django',) BROKER_URL = env("CELERY_BROKER_URL", default='django://') -CELERY_ACCEPT_CONTENT = ['json'] -CELERY_TASK_SERIALIZER = 'json' -CELERY_RESULT_SERIALIZER = 'json' -# ######### END CELERY +########## END CELERY {% endif %} # Your common stuff: Below this line define 3rd party library settings