X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/15dec706694c3afc006713be0fabb4973a6c2946..edf56edfdbea88b0e18c2e5aecbb6e62250ec3d7:/src/redakcja/settings/__init__.py?ds=sidebyside diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py index b9bdf5dd..71bc998c 100644 --- a/src/redakcja/settings/__init__.py +++ b/src/redakcja/settings/__init__.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import import os.path -from redakcja.settings.defaults import * -from redakcja.localsettings import * - +import sentry_sdk +from sentry_sdk.integrations.django import DjangoIntegration +from .defaults import * +from ..localsettings import * PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) @@ -31,28 +30,28 @@ TEMPLATES = [ }, ] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django_cas.middleware.CASMiddleware', + 'django_cas_ng.middleware.CASMiddleware', 'django.contrib.admindocs.middleware.XViewMiddleware', 'fnp_django_pagination.middleware.PaginationMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', -) +] if DEBUG: - MIDDLEWARE_CLASSES = ( + MIDDLEWARE = [ 'debug_toolbar.middleware.DebugToolbarMiddleware', - ) + MIDDLEWARE_CLASSES + ] + MIDDLEWARE AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', - 'fnpdjango.auth_backends.AttrCASBackend', + 'django_cas_ng.backends.CASBackend', ) ROOT_URLCONF = 'redakcja.urls' @@ -66,15 +65,14 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.admin', 'django.contrib.admindocs', - 'raven.contrib.django.raven_compat', 'sorl.thumbnail', 'fnp_django_pagination', 'django_gravatar', 'fileupload', - 'kombu.transport.django', 'pipeline', 'fnpdjango', + 'django_cas_ng', 'catalogue', 'cover', @@ -91,10 +89,6 @@ if DEBUG: LOGIN_REDIRECT_URL = '/documents/user' -CELERY_EAGER_PROPAGATES_EXCEPTIONS = True -CELERY_SEND_TASK_ERROR_EMAILS = True -CELERY_ACCEPT_CONTENT = ['pickle'] # Remove when all tasks jsonable. - MIN_COVER_SIZE = (915, 1270) STATICFILES_FINDERS = ( @@ -241,3 +235,15 @@ PIPELINE = { } } } + + +try: + SENTRY_DSN +except NameError: + pass +else: + sentry_sdk.init( + dsn=SENTRY_DSN, + integrations=[DjangoIntegration()] + ) +