update

Author: jaredmauch

Mailman/Handlers/SMTPDirect.py

@@ -188,9 +188,11 @@ def process(mlist, msg, msgdata):
                 '  To: %s\n'
                 '  Cc: %s\n'
                 '  List: %s\n'
-                '  Pipeline: %s',
+                '  Pipeline: %s\n'
+                '  Full msgdata: %s',
                 msgid, sender, subject, to, cc, mlist.internal_name(),
-                msgdata.get('pipeline', 'No pipeline'))
+                msgdata.get('pipeline', 'No pipeline'),
+                str(msgdata))
             return
 
     # Check for spam headers first

Mailman/Handlers/ToOutgoing.py

@@ -74,6 +74,10 @@ def process(mlist, msg, msgdata):
         # Ensure recipients are preserved in msgdata
         msgdata['recips'] = recips
         msgdata['recipient'] = recips[0] if recips else None
+        
+        # Log the full msgdata before enqueueing
+        mailman_log('debug', 'ToOutgoing: Full msgdata before enqueue:\n%s', str(msgdata))
+        
         outgoingq.enqueue(msg, msgdata, 
                          listname=mlist.internal_name())
         mailman_log('info', 'ToOutgoing: Successfully queued message %s for list %s',

Mailman/Queue/OutgoingRunner.py

@@ -245,6 +245,9 @@ def _dispose(self, mlist, msg, msgdata):
         msgid = msg.get('message-id', 'n/a')
         filebase = msgdata.get('_filebase', 'unknown')
 
+        # Log the full msgdata at the start of processing
+        mailman_log('debug', 'OutgoingRunner._dispose: Full msgdata at start:\n%s', str(msgdata))
+        
         # Ensure we have a MailList object
         if isinstance(mlist, str):
             try:
@@ -288,6 +291,9 @@ def _dispose(self, mlist, msg, msgdata):
                 self._unmark_message_processed(msgid)
                 return False
 
+            # Log the full msgdata after validation
+            mailman_log('debug', 'OutgoingRunner._dispose: Full msgdata after validation:\n%s', str(msgdata))
+
             # Validate message headers
             if not msg.get('message-id'):
                 mailman_log('error', 'OutgoingRunner._dispose: Message missing Message-ID header')

Mailman/Queue/Switchboard.py

@@ -113,6 +113,9 @@ def enqueue(self, msg, msgdata=None, listname=None, _plaintext=False, **kwargs):
 
         # Store any additional keyword arguments in msgdata
         msgdata.update(kwargs)
+        
+        # Log the full msgdata before processing
+        mailman_log('debug', 'Switchboard.enqueue: Full msgdata before processing:\n%s', str(msgdata))
 
         # Convert string message to Message object if needed
         if isinstance(msg, str):
@@ -244,6 +247,8 @@ def dequeue(self, filebase):
             # Read the message and metadata
             try:
                 msg, data = self._dequeue(filename)
+                # Log the full msgdata after dequeuing
+                mailman_log('debug', 'Switchboard.dequeue: Full msgdata after dequeuing:\n%s', str(data))
             except Exception as e:
                 mailman_log('error', 'Switchboard.dequeue: Failed to read message from %s: %s', filebase, str(e))
                 raise