From a97dfd55e980b477eb732d60ff63bb6cc17018bc Mon Sep 17 00:00:00 2001 From: AndreSouto Date: Tue, 16 Oct 2018 13:43:04 -0300 Subject: [PATCH] =?UTF-8?q?Adicionando=20informa=C3=A7=C3=A3o=20de=20host?= =?UTF-8?q?=20no=20log=20(em=20progresso)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/middleware.py | 16 ++++++++++++++++ sapl/settings.py | 16 +++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 sapl/middleware.py diff --git a/sapl/middleware.py b/sapl/middleware.py new file mode 100644 index 000000000..fad4e152f --- /dev/null +++ b/sapl/middleware.py @@ -0,0 +1,16 @@ +from django.contrib.sites.models import Site + +from sapl import settings + + +class SiteMiddleware(object): + def process_request(self, request): + try: + current_site = Site.objects.get(domain=request.get_host()) + except Site.DoesNotExist: + current_site = Site.objects.get(id=1) + + request.current_site = current_site + settings.HOST = request.get_host() + + import pdb; pdb.set_trace() diff --git a/sapl/settings.py b/sapl/settings.py index 7a3aba0be..9447e84f7 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -23,10 +23,11 @@ from unipath import Path from .temp_suppress_crispy_form_warnings import \ SUPRESS_CRISPY_FORM_WARNINGS_LOGGING +HOST = None + BASE_DIR = Path(__file__).ancestor(1) PROJECT_DIR = Path(__file__).ancestor(2) - # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = config('SECRET_KEY', default='') # SECURITY WARNING: don't run with debug turned on in production! @@ -74,6 +75,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.sites', # more 'django_extensions', @@ -132,8 +134,13 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', # 'speedinfo.middleware.ProfilerMiddleware', # Bug na versão 1.9 + + 'sapl.middleware.SiteMiddleware', ) +DEFAULT_SITE_ID = 1 +SITE_ID = 1 + CACHES = { 'default': { 'BACKEND': 'speedinfo.backends.proxy_cache', @@ -297,7 +304,7 @@ LOGGING = { 'disable_existing_loggers': False, 'formatters': { 'verbose': { - 'format': '%(levelname)s %(asctime)s %(filename)s %(funcName)s %(lineno)d %(name)s %(message)s' + 'format': '%(levelname)s %(asctime)s ' + str(HOST) + ' %(filename)s %(funcName)s %(lineno)d %(name)s %(message)s' }, 'simple': { 'format': '%(levelname)s %(asctime)s %(message)s' @@ -307,7 +314,10 @@ LOGGING = { # TODO Ver depois ! 'require_debug_false': { '()': 'django.utils.log.RequireDebugFalse' - } + }, + 'site_filter': { + '()': 'sapl.logging_filters.SiteFilter', + }, }, 'handlers': { 'console': {