update

Author: jaredmauch

Mailman/Handlers/SMTPDirect.py

@@ -214,7 +214,7 @@ def process(mlist, msg, msgdata):
         deliveryfunc = bulkdeliver
 
     try:
-        origrecips = msgdata['recips']
+        origrecips = msgdata.get('recips', None)
         origsender = msgdata.get('original_sender', msg.get_sender())
         conn = Connection()
         try:
@@ -399,7 +399,7 @@ def bulkdeliver(mlist, msg, msgdata, envsender, failures, conn):
         # Get the list of recipients
         recips = msgdata.get('recipients', [])
         if not recips:
-            mailman_log('error', 'No recipients found in msgdata')
+            mailman_log('error', 'SMTPDirect: No recipients found in msgdata for message:\n%s', msg.get('Message-ID', 'n/a'))
             return
 
         # Convert email.message.Message to Mailman.Message if needed

Mailman/Queue/IncomingRunner.py

@@ -182,7 +182,7 @@ def _dispose(self, mlist, msg, msgdata):
             recipients = msgdata.get('recipients', [])
             mailman_log('debug', '  Recipients: %s', recipients)
             if not recipients:
-                mailman_log('error', 'No recipients found in msgdata for message %s', msgid)
+                mailman_log('error', 'IncomingRunner: No recipients found in msgdata for message %s', msgid)
                 mailman_log('error', '  Message data: %s', str(msgdata))
                 mailman_log('error', '  To header: %s', msg.get('to', 'unknown'))
                 mailman_log('error', '  Cc header: %s', msg.get('cc', 'unknown'))

Mailman/Queue/OutgoingRunner.py

@@ -395,7 +395,7 @@ def _process_regular(self, mlist, msg, msgdata):
                     recipient = addrs[0][1]
 
         if not recipient:
-            mailman_log('error', 'No recipients found in msgdata for message: %s', msgid)
+            mailman_log('error', 'OutgoingRunner: No recipients found in msgdata for message: %s', msgid)
             return False
 
         # Set the recipient in msgdata for future use

Mailman/Queue/Switchboard.py

@@ -182,9 +182,9 @@ def enqueue(self, msg, msgdata=None, listname=None, _plaintext=False, **kwargs):
                     mailman_log('debug', 'Switchboard.enqueue: Set recipients from message headers for message: %s',
                                msg.get('message-id', 'n/a'))
                 else:
-                    mailman_log('error', 'Switchboard.enqueue: No recipients found in msgdata or message headers for message: %s',
+                    mailman_log('error', 'Switchboard: No recipients found in msgdata or message headers for message: %s',
                                msg.get('message-id', 'n/a'))
-                    raise ValueError('No recipients found in msgdata or message headers')
+                    raise ValueError('Switchboard: No recipients found in msgdata or message headers')
 
         # Generate a unique filebase
         filebase = self._make_filebase(msg, msgdata)