Merge pull request #875 from nledez/mail-debug

Add MAIL_DEBUG_BODY and modify the behaviour of MAIL_DEBUG
cgwire · Oct 18, 2024 · dbb0605 · dbb0605
2 parents 362c19c + 5400ca6
commit dbb0605
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/zou/app/config.py b/zou/app/config.py
@@ -81,7 +81,8 @@
 MAIL_PORT = os.getenv("MAIL_PORT", 25)
 MAIL_USERNAME = os.getenv("MAIL_USERNAME", "")
 MAIL_PASSWORD = os.getenv("MAIL_PASSWORD", "")
-MAIL_DEBUG = envtobool("MAIL_DEBUG", False)
+MAIL_DEBUG = envtobool("MAIL_DEBUG", 0)
+MAIL_DEBUG_BODY = envtobool("MAIL_DEBUG_BODY", False)
 MAIL_USE_TLS = envtobool("MAIL_USE_TLS", False)
 MAIL_USE_SSL = envtobool("MAIL_USE_SSL", False)
 MAIL_DEFAULT_SENDER = os.getenv(

diff --git a/zou/app/utils/emails.py b/zou/app/utils/emails.py
@@ -12,9 +12,9 @@ def send_email(subject, html, recipient_email, body=None):
     """
     if body is None:
         body = strip_html_tags(html)
-    if app.config["MAIL_DEBUG"]:
+    if app.config["MAIL_DEBUG_BODY"]:
         print(body)
-    elif app.config["MAIL_ENABLED"]:
+    if app.config["MAIL_ENABLED"]:
         with app.app_context():
             try:
                 mail_default_sender = app.config["MAIL_DEFAULT_SENDER"]