Update of /cvsroot/mailman/mailman/Mailman/Handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv2093
Modified Files:
Tag: Release_2_1-maint
SMTPDirect.py
Log Message:
bulkdeliver(): Include the Message-ID in the log message.
Index: SMTPDirect.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/SMTPDirect.py,v
retrieving revision 2.25.2.5
retrieving revision 2.25.2.6
diff -u -d -r2.25.2.5 -r2.25.2.6
--- SMTPDirect.py 26 Nov 2003 20:26:32 -0000 2.25.2.5
+++ SMTPDirect.py 27 Nov 2003 00:05:47 -0000 2.25.2.6
@@ -345,15 +345,17 @@
msgtext = msg.as_string()
refused = {}
recips = msgdata['recips']
+ msgid = msg['message-id']
try:
# Send the message
refused = conn.sendmail(envsender, recips, msgtext)
except smtplib.SMTPRecipientsRefused, e:
- syslog('smtp-failure', 'All recipients refused: %s', e)
+ syslog('smtp-failure', 'All recipients refused: %s, msgid: %s',
+ e, msgid
refused = e.recipients
except smtplib.SMTPResponseException, e:
- syslog('smtp-failure', 'SMTP session failure: %s, %s',
- e.smtp_code, smtp_error)
+ syslog('smtp-failure', 'SMTP session failure: %s, %s, msgid: %s',
+ e.smtp_code, smtp_error, msgid)
# If this was a permanent failure, don't add the recipients to the
# refused, because we don't want them to be added to failures.
# Otherwise, if the MTA rejects the message because of the message
@@ -368,7 +370,7 @@
# MTA not responding, or other socket problems, or any other kind of
# SMTPException. In that case, nothing got delivered, so treat this
# as a temporary failure.
- syslog('smtp-failure', 'Low level smtp connection error: %s', e)
+ syslog('smtp-failure', 'Low level smtp error: %s, msgid: %s', e, msgid)
error = str(e)
for r in recips:
refused[r] = (-1, error)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
