Ticket #9383: mail_admins.diff

django/core/handlers/base.py

@@ -148 +148 @@
             return debug.technical_500_response(request, *exc_info)
 
         # When DEBUG is False, send an error message to the admins.
-        subject = 'Error (%s IP): %s' % ((request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS and 'internal' or 'EXTERNAL'), request.path)
-        try:
-            request_repr = repr(request)
-        except:
-            request_repr = "Request repr() unavailable"
-        message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr)
-        mail_admins(subject, message, fail_silently=True)
+        if settings.ADMINS:
+            subject = 'Error (%s IP): %s' % ((request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS and 'internal' or 'EXTERNAL'), request.path)
+            try:
+                request_repr = repr(request)
+            except:
+                request_repr = "Request repr() unavailable"
+            message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr)
+            mail_admins(subject, message, fail_silently=True)
+            
         # Return an HttpResponse that displays a friendly error message.
         callback, param_dict = resolver.resolve500()
         return callback(request, **param_dict)

django/core/mail.py

@@ -366 +366 @@
 
 def mail_admins(subject, message, fail_silently=False):
     """Sends a message to the admins, as defined by the ADMINS setting."""
-    EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
+    if settings.ADMINS:
+        EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
                  settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS]
                  ).send(fail_silently=fail_silently)
 
 def mail_managers(subject, message, fail_silently=False):
     """Sends a message to the managers, as defined by the MANAGERS setting."""
-    EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
+    if settings.MANAGERS:
+        EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message,
                  settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS]
                  ).send(fail_silently=fail_silently)

tests/regressiontests/mail/tests.py

@@ -2 +2 @@
 r"""
 # Tests for the django.core.mail.
 
->>> from django.core.mail import EmailMessage
+>>> from django.core.mail import EmailMessage, mail_admins, mail_managers
 >>> from django.utils.translation import ugettext_lazy
 
 # Test normal ascii character case:
@@ -60 +60 @@
 >>> email.message().as_string()
 'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: subject\nFrom: from@example.com\nTo: to@example.com\ndate: Fri, 09 Nov 2001 01:08:47 -0000\nMessage-ID: foo\n\ncontent'
 
+# Test that mail_admins/mail_managers doesn't connect to the mail server if there are no recipients (#9383)
+
+>>> from django.core import mail
+>>> from django.conf import settings
+>>> old_admins = settings.ADMINS
+>>> old_managers = settings.MANAGERS
+>>> settings.ADMINS = []
+>>> settings.MANAGERS = []
+>>> mail.outbox = []
+>>> mail_admins('hi','there') 
+>>> len(mail.outbox)
+0
+>>> mail.outbox = []
+>>> mail_managers('hi','there')
+>>> len(mail.outbox)
+0
+>>> settings.ADMINS = settings.MANAGERS = [('nobody','nobody@example.com')]
+>>> mail.outbox = []
+>>> mail_admins('hi','there')
+>>> len(mail.outbox)
+1
+>>> mail.outbox = []
+>>> mail_managers('hi','there')
+>>> len(mail.outbox)
+1
+>>> settings.ADMINS = old_admins
+>>> settings.MANAGERS = old_managers
+
 """

docs/topics/email.txt

@@ -106 +106 @@
 The "From:" header of the e-mail will be the value of the
 :setting:`SERVER_EMAIL` setting.
 
+If :setting:`ADMINS` is empty, this function does nothing.
+
 This method exists for convenience and readability.
 
 mail_managers() function