[feature] Added default EMAIL_TIMEOUT openwisp#257

Closes openwisp#257
shubham-yadavv · Mar 22, 2023 · efbda73 · efbda73
1 parent a6fd4f6
commit efbda73
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/customization/configuration/django/custom_django_settings.example.py b/customization/configuration/django/custom_django_settings.example.py
@@ -6,3 +6,4 @@
 # EMAIL_HOST_PASSWORD =
 # EMAIL_PORT =
 # EMAIL_USE_TLS =
+# EMAIL_TIMEOUT =
diff --git a/docs/ENV.md b/docs/ENV.md
@@ -442,6 +442,12 @@ Any OpenWISP Configuration of type `string`. `int`, `bool` or `json` is supporte
 - **Valid Values:** True | False
 - **Default:** False
 
+### `EMAIL_TIMEOUT`
+
+- **Explanation:** Specifies a timeout in seconds used by Django for blocking operations like the connection attempt.
+- **Valid Values:** INTEGER
+- **Default:** 10
+
 ### `POSTFIX_ALLOWED_SENDER_DOMAINS`
 
 - **Explanation:** Due to in-built spam protection in Postfix you will need to specify sender domains.

diff --git a/images/common/openwisp/settings.py b/images/common/openwisp/settings.py
@@ -265,6 +265,7 @@
 EMAIL_HOST_USER = os.environ['EMAIL_HOST_USER']
 EMAIL_HOST_PASSWORD = os.environ['EMAIL_HOST_PASSWORD']
 EMAIL_USE_TLS = env_bool(os.environ['EMAIL_HOST_TLS'])
+EMAIL_TIMEOUT = os.environ['EMAIL_TIMEOUT']
 
 # Logging
 # http://docs.djangoproject.com/en/dev/topics/logging

diff --git a/images/openwisp_base/Dockerfile b/images/openwisp_base/Dockerfile
@@ -118,6 +118,7 @@ ENV DASHBOARD_APP_SERVICE=dashboard \
     EMAIL_HOST_USER="" \
     EMAIL_HOST_PASSWORD="" \
     EMAIL_HOST_TLS=False \
+    EMAIL_TIMEOUT=10 \
     [email protected] \
     DJANGO_LOG_LEVEL=ERROR \
     DJANGO_LANGUAGE_CODE=en-gb \