From a315cb4cf5ab43dc300d9b9cff1c7b74d32128c3 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 22 Sep 2020 11:36:43 +0200 Subject: [PATCH 1/3] rm special logging for django.server --- castellum/settings/default.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/castellum/settings/default.py b/castellum/settings/default.py index efe481237..4d1b98037 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -231,10 +231,6 @@ LOGGING = { 'verbose': { 'format': '[%(asctime)s] %(levelname)s %(name)s %(message)s' }, - 'django.server': { - '()': 'django.utils.log.ServerFormatter', - 'format': '[%(server_time)s] %(message)s', - }, }, 'handlers': { 'console': { @@ -246,10 +242,6 @@ LOGGING = { 'filename': os.path.join(LOG_DIR, 'monitoring.log'), 'formatter': 'verbose', }, - 'django.server': { - 'class': 'logging.StreamHandler', - 'formatter': 'django.server', - }, }, 'loggers': { 'django': { @@ -262,12 +254,6 @@ LOGGING = { 'handlers': ['monitoring-file'], 'level': 'INFO', }, - # 'django.server' is the development server. It is not used in production. - 'django.server': { - 'handlers': ['django.server'], - 'level': 'INFO', - 'propagate': False, - }, }, } -- GitLab From 9e231c720bf56a92b475c2314b4858c78f246178 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 22 Sep 2020 10:57:47 +0200 Subject: [PATCH 2/3] log monitoring also to console --- Dockerfile | 4 ---- castellum/settings/default.py | 12 +----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c8eb78a8..f2eb56ad8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,6 @@ ENV RUNTIMEPKGS uwsgi uwsgi-python python3 py3-psycopg2 py3-pyldap libmagic proj RUN adduser -D -g '' uwsgi -RUN mkdir -p /log -RUN chown uwsgi /log -VOLUME /log - RUN mkdir -p /media RUN chown uwsgi /media VOLUME /media diff --git a/castellum/settings/default.py b/castellum/settings/default.py index 4d1b98037..4fbfd6964 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -218,11 +218,6 @@ BOOTSTRAP4 = { AXES_LOCKOUT_TEMPLATE = 'axes-lockout.html' -if os.access('/log', os.W_OK): - LOG_DIR = '/log' -else: - LOG_DIR = BASE_DIR - # See https://docs.djangoproject.com/en/stable/topics/logging/ LOGGING = { 'version': 1, @@ -237,11 +232,6 @@ LOGGING = { 'class': 'logging.StreamHandler', 'formatter': 'verbose', }, - 'monitoring-file': { - 'class': 'logging.FileHandler', - 'filename': os.path.join(LOG_DIR, 'monitoring.log'), - 'formatter': 'verbose', - }, }, 'loggers': { 'django': { @@ -251,7 +241,7 @@ LOGGING = { # 'monitoring' is our custom logger namespace to monitor user behavior. # It contains potentially sensitive information (e.g. subject search terms). 'monitoring': { - 'handlers': ['monitoring-file'], + 'handlers': ['console'], 'level': 'INFO', }, }, -- GitLab From ad125233e7e2a6225c242202d4d21a4fe0f76125 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Tue, 22 Sep 2020 11:40:08 +0200 Subject: [PATCH 3/3] mv to example deployment --- castellum/settings/default.py | 29 ----------------------------- docs/example_deployment/settings.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/castellum/settings/default.py b/castellum/settings/default.py index 4fbfd6964..bcd2da727 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -218,35 +218,6 @@ BOOTSTRAP4 = { AXES_LOCKOUT_TEMPLATE = 'axes-lockout.html' -# See https://docs.djangoproject.com/en/stable/topics/logging/ -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'formatters': { - 'verbose': { - 'format': '[%(asctime)s] %(levelname)s %(name)s %(message)s' - }, - }, - 'handlers': { - 'console': { - 'class': 'logging.StreamHandler', - 'formatter': 'verbose', - }, - }, - 'loggers': { - 'django': { - 'handlers': ['console'], - 'level': 'INFO', - }, - # 'monitoring' is our custom logger namespace to monitor user behavior. - # It contains potentially sensitive information (e.g. subject search terms). - 'monitoring': { - 'handlers': ['console'], - 'level': 'INFO', - }, - }, -} - # Secondary language in emails for readers who do not understand the # primary language CASTELLUM_FALLBACK_LANGUAGE = 'en' diff --git a/docs/example_deployment/settings.py b/docs/example_deployment/settings.py index 3bc7eef9f..926244ac5 100644 --- a/docs/example_deployment/settings.py +++ b/docs/example_deployment/settings.py @@ -28,6 +28,35 @@ ALLOWED_HOSTS = ['*'] MEDIA_ROOT = '/media' +# See https://docs.djangoproject.com/en/stable/topics/logging/ +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '[%(asctime)s] %(levelname)s %(name)s %(message)s' + }, + }, + 'handlers': { + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'verbose', + }, + }, + 'loggers': { + 'django': { + 'handlers': ['console'], + 'level': 'INFO', + }, + # 'monitoring' is our custom logger namespace to monitor user behavior. + # It contains potentially sensitive information (e.g. subject search terms). + 'monitoring': { + 'handlers': ['console'], + 'level': 'INFO', + }, + }, +} + # The example deployment does not contain a mail server, so use dummy instead EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -- GitLab