E-mailverzending oneindige timeout #1310

dsmrreader · Mar 7, 2021 · 4d53b8d · 4d53b8d
1 parent 7307c9b
commit 4d53b8d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -28,6 +28,7 @@ v4.13.0 - 2021-xx-xx
 
 - ``Fixed``: Schoonheidsfoutje op de statistieken pagina [`#1305 <https://github.com/dsmrreader/dsmr-reader/issues/1305>`_]
 - ``Fixed``: Bestaande superusers uitschakelen bij uitvoeren "dsmr_superuser" command [`#1309 <https://github.com/dsmrreader/dsmr-reader/issues/1309>`_]
+- ``Fixed``: E-mailverzending timeout [`#1310 <https://github.com/dsmrreader/dsmr-reader/issues/1310>`_]
 
 
 v4.12.0 - 2021-02-17

diff --git a/dsmr_backend/services/email.py b/dsmr_backend/services/email.py
@@ -27,7 +27,9 @@ def send(email_from, email_to, subject, body, attachment=None):
         use_ssl=email_settings.use_ssl
     )
 
-    # Force translations.
+    # Prevent hanging processes, ensure there is always a timeout set.
+    assert email_backend.timeout is not None
+
     message = mail.EmailMessage(
         subject=subject,
         body=body,

diff --git a/dsmr_backend/tests/services/test_email.py b/dsmr_backend/tests/services/test_email.py
@@ -23,7 +23,8 @@ def test_send_email(self, attach_file_mock, send_mock):
             email_from='root@localhost',
             email_to='root@localhost',
             subject='Test',
-            body='Body')
+            body='Body'
+        )
 
         self.assertTrue(send_mock.called)
         self.assertFalse(attach_file_mock.called)
@@ -36,7 +37,8 @@ def test_send_email_with_attachment(self, attach_file_mock, send_mock):
             email_to='root@localhost',
             subject='Test',
             body='Body',
-            attachment='/tmp/test')
+            attachment='/tmp/test'
+        )
 
         self.assertTrue(send_mock.called)
         self.assertTrue(attach_file_mock.called)
diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -1,5 +1,5 @@
 from django.utils.version import get_version
 
-VERSION = (4, 13, 0, 'beta', 6)
+VERSION = (4, 13, 0, 'beta', 7)
 
 __version__ = get_version(VERSION)
diff --git a/dsmrreader/config/base.py b/dsmrreader/config/base.py
@@ -156,6 +156,7 @@
 
 LOCALE_PATHS = (os.path.join(BASE_DIR, 'locales'), )
 
+EMAIL_TIMEOUT = 30
 
 """ Python Logging. """
 LOGGING = {

diff --git a/dsmrreader/locales/nl/LC_MESSAGES/django.mo b/dsmrreader/locales/nl/LC_MESSAGES/django.mo