From 6d1684214b0d36c44d8de96e39a2767f2ffc15b7 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 26 Mar 2018 09:19:48 +0300 Subject: [PATCH] Disable silk on remote server --- project/settings.py | 13 +++++-------- project/urls.py | 4 +++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/project/settings.py b/project/settings.py index 7d8a067a..eab7dda7 100644 --- a/project/settings.py +++ b/project/settings.py @@ -66,8 +66,6 @@ INSTALLED_APPS = [ 'apps.content', 'apps.school', ] -if DEBUG: - INSTALLED_APPS += ['silk'] MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', @@ -266,12 +264,6 @@ CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ ), }) - -try: - from .local_settings import * -except ImportError: - pass - try: from paymentwall import * except ImportError: @@ -302,3 +294,8 @@ RAVEN_CONFIG = { # release based on the git info. 'release': raven.fetch_git_sha(BASE_DIR), } + +try: + from .local_settings import * +except ImportError: + pass diff --git a/project/urls.py b/project/urls.py index b0c6ddb8..b8f22484 100644 --- a/project/urls.py +++ b/project/urls.py @@ -82,6 +82,8 @@ if settings.DEBUG: from django.conf.urls.static import static from django.contrib.staticfiles.urls import staticfiles_urlpatterns - urlpatterns += [path('silk/', include('silk.urls', namespace='silk'))] + if 'silk' in settings.INSTALLED_APPS: + urlpatterns += [path('silk/', include('silk.urls', namespace='silk'))] + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += staticfiles_urlpatterns()