X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2a83d92bc0f541d419ea46000ea96f1a7b4b4394..c58ede829174b66ec4d2b0c949b771a3eed27e1b:/redakcja/settings/common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 09d5016e..5146dcda 100644
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -79,7 +79,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django_cas.middleware.CASMiddleware',
 
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
@@ -112,9 +112,8 @@ INSTALLED_APPS = (
     'sorl.thumbnail',
     'pagination',
     'django_gravatar',
-    'djcelery',
-    'djkombu',
     'fileupload',
+    'kombu.transport.django',
     'pipeline',
     'fnpdjango',
 
@@ -138,15 +137,10 @@ CAS_USER_ATTRS_MAP = {
 IMAGE_DIR = 'images/'
 
 
-import djcelery
-djcelery.setup_loader()
-
-BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
-BROKER_HOST = "localhost"
-BROKER_PORT = 5672
-BROKER_USER = "guest"
-BROKER_PASSWORD = "guest"
-BROKER_VHOST = "/"
+BROKER_URL = 'django://'
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
+CELERY_SEND_TASK_ERROR_EMAILS = True
+CELERY_ACCEPT_CONTENT = ['pickle']  # Remove when all tasks jsonable.
 
 SHOW_APP_VERSION = False