HOTFIX: emails: improve test command & mw backend

Bug: T409420

Author: jsnshrmn

TWLight/emails/backends/mediawiki.py

@@ -195,9 +195,10 @@ def open(self):
             self.email_token = email_token
             logger.info("Email API session ready.")
             return True
-        except:
+        except Exception as e:
             if not self.fail_silently:
-                raise
+                logger.error(e)
+                raise e
 
     def close(self):
         """Unset the session."""
@@ -282,8 +283,9 @@ def _send(self, email_message):
                     raise Exception(dumps(emailuser_response))
 
                 logger.info("Email sent.")
-        except:
+        except Exception as e:
             if not self.fail_silently:
-                raise
+                logger.error(e)
+                raise e
             return False
         return True

TWLight/emails/tasks.py

@@ -43,7 +43,7 @@
 from TWLight.applications.signals import Reminder
 from TWLight.resources.models import AccessCode, Partner
 from TWLight.users.groups import get_restricted
-from TWLight.users.signals import Notice, TestEmail, UserLoginRetrieval
+from TWLight.users.signals import Notice, UserLoginRetrieval
 from djmail.models import Message
 
 logger = logging.getLogger(__name__)
@@ -222,12 +222,19 @@ def send_survey_active_user_email(**kwargs):
     email.send()
 
 
-@receiver(TestEmail.test)
 def send_test(sender, **kwargs):
-    user_email = kwargs["email"]
-    connection = get_connection(
-        backend="TWLight.emails.backends.mediawiki.EmailBackend"
+    backend = (
+        kwargs["backend"]
+        if "backend" in kwargs
+        else "TWLight.emails.backends.mediawiki.EmailBackend"
+    )
+    connection = (
+        kwargs["connection"]
+        if "connection" in kwargs
+        else get_connection(backend=backend)
     )
+
+    user_email = kwargs["email"]
     template_email = Test()
     email = template_email.make_email_object(user_email, {}, connection=connection)
     email.send()

TWLight/users/management/commands/test_email.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from django.contrib.auth.models import User
+from django.core.mail import get_connection
 from django.core.management.base import BaseCommand
 
-from TWLight.users.signals import TestEmail
+from TWLight.emails.tasks import send_test
 
 
 class Command(BaseCommand):
@@ -14,13 +15,30 @@ def add_arguments(self, parser):
             type=str,
             help="The wikipedia editor to send the test email to",
         )
+        parser.add_argument(
+            "--backend",
+            type=str,
+            required=False,
+            help="djmail backend to use; default is TWLight.emails.backends.mediawiki.EmailBackend",
+        )
 
     def handle(self, *args, **options):
         user = User.objects.select_related("editor").get(
             editor__wp_username=options["wp_username"]
         )
-        TestEmail.test.send(
+        backend = (
+            options["backend"]
+            if options["backend"]
+            else "TWLight.emails.backends.mediawiki.EmailBackend"
+        )
+        # Use a single connection to send all emails
+        connection = get_connection(backend=backend)
+        connection.open()
+        send_test(
             sender=self.__class__,
+            backend=backend,  # allows setting the djmail backend back to default for testing
+            connection=connection,  # passing in the connection lets us handle these in bulk
             wp_username=user.editor.wp_username,
             email=user.email,
         )
+        connection.close()

TWLight/users/signals.py

@@ -25,10 +25,6 @@ class Notice(object):
     user_renewal_notice = Signal()
 
 
-class TestEmail(object):
-    test = Signal()
-
-
 class UserLoginRetrieval(object):
     user_retrieve_monthly_logins = Signal()