diff options
| -rw-r--r-- | Mailman/Defaults.py.in | 4 | ||||
| -rw-r--r-- | Mailman/Handlers/Hold.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 4286e4688..f2b59ab4f 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -507,13 +507,13 @@ SMTP_LOG_EVERY_MESSAGE = ( # Mutually exclusive with SMTP_LOG_REFUSED. SMTP_LOG_SUCCESS = ( 'post', - 'post to %(listname)s from %(sender)s, size=%(size)d, success') + 'post to %(listname)s from %(sender)s, size=%(size)d, message-id=%(msg_message-id)s, success') # This will only be printed if there were any addresses which encountered an # immediate smtp failure. Mutually exclusive with SMTP_LOG_SUCCESS. SMTP_LOG_REFUSED = ( 'post', - 'post to %(listname)s from %(sender)s, size=%(size)d, %(#refused)d failures') + 'post to %(listname)s from %(sender)s, size=%(size)d, message-id=%(msg_message-id)s, %(#refused)d failures') # This will be logged for each specific recipient failure. Additional %()s # keys are: diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 152239595..a037b0d6b 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -197,6 +197,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): exc = exc() listname = mlist.real_name sender = msgdata.get('sender', msg.get_sender()) + message_id = msg.get('message-id', 'n/a') owneraddr = mlist.GetOwnerEmail() adminaddr = mlist.GetBouncesEmail() requestaddr = mlist.GetRequestEmail() @@ -274,7 +275,8 @@ also appear in the first line of the body of the reply.""")), finally: i18n.set_translation(otranslation) # Log the held message - syslog('vette', '%s post from %s held: %s', listname, sender, reason) + syslog('vette', '%s post from %s held, message-id=%s: %s', + listname, sender, message_id, reason) # raise the specific MessageHeld exception to exit out of the message # delivery pipeline raise exc |