From f9751d38dba3a27424cdd6c12e0d20fd650389d7 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 15:24:26 +0100 Subject: [PATCH] #93 Errors via mail * configures server errors sending via mail * default for now is always 'ksp-servicestelle' * includes improvements from #97 --- konova/sub_settings/django_settings.py | 44 ++++--------------- konova/utils/mailer.py | 4 -- logs/error.log | 0 .../email/checking/shared_data_checked.html | 2 +- .../email/deleting/shared_data_deleted.html | 2 +- .../email/recording/shared_data_recorded.html | 2 +- .../recording/shared_data_unrecorded.html | 2 +- .../email/sharing/shared_access_given.html | 2 +- .../email/sharing/shared_access_removed.html | 2 +- 9 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 logs/error.log diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py index 84039b5..b0d6ff8 100644 --- a/konova/sub_settings/django_settings.py +++ b/konova/sub_settings/django_settings.py @@ -32,6 +32,10 @@ SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +ADMINS = [ + ('KSP-Servicestelle', 'ksp-servicestelle@sgdnord.rlp.de'), +] + ALLOWED_HOSTS = [ "127.0.0.1", "localhost", @@ -207,10 +211,12 @@ DEBUG_TOOLBAR_CONFIG = { # EMAIL (see https://docs.djangoproject.com/en/dev/topics/email/) # CHANGE_ME !!! ONLY FOR DEVELOPMENT !!! -EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' -EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location +if DEBUG: + EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' + EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location DEFAULT_FROM_EMAIL = "service@ksp.de" # The default email address for the 'from' element +SERVER_EMAIL = DEFAULT_FROM_EMAIL # The default email sender address, which is used by Django to send errors via mail EMAIL_HOST = "localhost" EMAIL_REPLY_TO = "ksp-servicestelle@sgdnord.rlp.de" SUPPORT_MAIL_RECIPIENT = EMAIL_REPLY_TO @@ -219,37 +225,3 @@ EMAIL_PORT = "25" #EMAIL_HOST_PASSWORD = "" EMAIL_USE_TLS = False EMAIL_USE_SSL = False - -# LOGGING -BASIC_LOGGER = "logger" -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'formatters': { - 'verbose': { - 'format': '{levelname} {asctime} {module}: {message}', - 'style': '{', - }, - 'simple': { - 'format': '{levelname} {message}', - 'style': '{', - }, - }, - 'handlers': { - 'log_to_file': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': '{}/logs/error.log'.format(BASE_DIR), - 'maxBytes': 1024*1024*5, # 5 MB - 'backupCount': 5, - 'formatter': 'verbose', - }, - }, - 'loggers': { - BASIC_LOGGER: { - 'handlers': ['log_to_file'], - 'level': 'INFO', - 'propagate': True, - }, - }, -} \ No newline at end of file diff --git a/konova/utils/mailer.py b/konova/utils/mailer.py index ee0ac9e..e174ae5 100644 --- a/konova/utils/mailer.py +++ b/konova/utils/mailer.py @@ -5,16 +5,12 @@ Contact: michel.peltriaux@sgdnord.rlp.de Created on: 09.11.20 """ -import logging - from django.core.mail import send_mail from django.template.loader import render_to_string from django.utils.translation import gettext_lazy as _ from konova.sub_settings.django_settings import DEFAULT_FROM_EMAIL, EMAIL_REPLY_TO, SUPPORT_MAIL_RECIPIENT -logger = logging.getLogger(__name__) - class Mailer: """ diff --git a/logs/error.log b/logs/error.log deleted file mode 100644 index e69de29..0000000 diff --git a/templates/email/checking/shared_data_checked.html b/templates/email/checking/shared_data_checked.html index ccc0bbf..0707cfb 100644 --- a/templates/email/checking/shared_data_checked.html +++ b/templates/email/checking/shared_data_checked.html @@ -9,7 +9,7 @@
{% trans 'the following dataset has just been checked' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'This means, the responsible registration office just confirmed the correctness of this dataset.' %}
diff --git a/templates/email/deleting/shared_data_deleted.html b/templates/email/deleting/shared_data_deleted.html index 36c80b0..b920f1e 100644 --- a/templates/email/deleting/shared_data_deleted.html +++ b/templates/email/deleting/shared_data_deleted.html @@ -9,7 +9,7 @@
{% trans 'the following dataset has just been deleted' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'If this should not have been happened, please contact us. See the signature for details.' %}
diff --git a/templates/email/recording/shared_data_recorded.html b/templates/email/recording/shared_data_recorded.html index 82d236d..f8db918 100644 --- a/templates/email/recording/shared_data_recorded.html +++ b/templates/email/recording/shared_data_recorded.html @@ -9,7 +9,7 @@
{% trans 'the following dataset has just been recorded' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'This means the data is now publicly available, e.g. in LANIS' %}
diff --git a/templates/email/recording/shared_data_unrecorded.html b/templates/email/recording/shared_data_unrecorded.html index a40e7ce..d4639c9 100644 --- a/templates/email/recording/shared_data_unrecorded.html +++ b/templates/email/recording/shared_data_unrecorded.html @@ -9,7 +9,7 @@
{% trans 'the following dataset has just been unrecorded' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'This means the data is no longer publicly available.' %}
diff --git a/templates/email/sharing/shared_access_given.html b/templates/email/sharing/shared_access_given.html index bf93e86..b8b26b7 100644 --- a/templates/email/sharing/shared_access_given.html +++ b/templates/email/sharing/shared_access_given.html @@ -9,7 +9,7 @@
{% trans 'the following dataset has just been shared with you' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'This means you can now edit this dataset.' %} {% trans 'The shared dataset appears now by default on your overview for this dataset type.' %} diff --git a/templates/email/sharing/shared_access_removed.html b/templates/email/sharing/shared_access_removed.html index be6a4d6..86d4fdd 100644 --- a/templates/email/sharing/shared_access_removed.html +++ b/templates/email/sharing/shared_access_removed.html @@ -9,7 +9,7 @@
{% trans 'your shared access, including editing, has been revoked for the dataset ' %}
- '{{obj_identifier}}' + {{obj_identifier}}
{% trans 'However, you are still able to view the dataset content.' %} {% trans 'Please use the provided search filter on the dataset`s overview pages to find them.' %}