aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2014-10-25 13:08:25 -0700
committerMark Sapiro <mark@msapiro.net>2014-10-25 13:08:25 -0700
commit77e40fbbc6bcc5107ab3cf761d312566afda97d5 (patch)
treeec8d4a90815b9d57c6bfacd51dcab731838cf120
parent0cd26479eff8876bb7955d560464e575904a12be (diff)
downloadmailman2-77e40fbbc6bcc5107ab3cf761d312566afda97d5.tar.gz
mailman2-77e40fbbc6bcc5107ab3cf761d312566afda97d5.tar.xz
mailman2-77e40fbbc6bcc5107ab3cf761d312566afda97d5.zip
Added list name and handler name to auto-discard vette log entry.
-rw-r--r--Mailman/Queue/IncomingRunner.py9
-rwxr-xr-xNEWS3
2 files changed, 9 insertions, 3 deletions
diff --git a/Mailman/Queue/IncomingRunner.py b/Mailman/Queue/IncomingRunner.py
index bcc51209..eab4d2c5 100644
--- a/Mailman/Queue/IncomingRunner.py
+++ b/Mailman/Queue/IncomingRunner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -157,8 +157,11 @@ class IncomingRunner(Runner):
os._exit(1)
except Errors.DiscardMessage:
# Throw the message away; we need do nothing else with it.
- syslog('vette', 'Message discarded, msgid: %s',
- msg.get('message-id', 'n/a'))
+ syslog('vette', """Message discarded, msgid: %s'
+ list: %s,
+ handler: %s""",
+ msg.get('message-id', 'n/a'),
+ mlist.real_name, handler)
return 0
except Errors.HoldMessage:
# Let the approval process take it from here. The message no
diff --git a/NEWS b/NEWS
index ece6b694..228f8442 100755
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - The vette log entry for a message discarded by a handler now includes
+ the list name and the name of the handler. (LP: #558096)
+
- The options CGI now rejects all but HTTP GET and POST requests.
(LP: #1372199)