-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Barry Warsaw wrote: | On Jun 20, 2008, at 1:48 PM, Fil wrote: | |> A very useful patch (against 2.1.11rc1) | | |> --- Mailman/Queue/BounceRunner.save.py 2008-06-20 19:34:51.000000000 |> +0200 |> +++ Mailman/Queue/BounceRunner.py 2008-06-20 19:35:44.000000000 |> +0200 |> @@ -230,7 +230,8 @@ class BounceRunner(Runner, BounceMixin): |> # If that still didn't return us any useful addresses, then |> send it on |> # or discard it. |> if not addrs: |> - syslog('bounce', 'bounce message w/no discernable |> addresses: %s', |> + syslog('bounce', 'bounce message to %s w/no discernable |> addresses: %s', |> + mlist.internal_name(), |> msg.get('message-id')) |> maybe_forward(mlist, msg) |> return | | Seems reasonable to me! | +1
My suggestion is a bit different. The patch is attached, but I'm not completely sure about it. I have changed Fil's log message from 'bounce message to %s w/no discernable addresses: %s' to '%s: bounce message w/no discernable addresses: %s' This is both to make it more consistent with other bounce log messages and to avoid mangling the existing string in case someone's log analysis is looking for it. The part I'm not sure about is adding the list name to the '(forwarding|discarding) unrecognized' messages. One or the other of these is always written immediately after the 'bounce message w/no discernable addresses' message, so the list name isn't really required since the list will be identifiable with the first change, and it may even seem redundant, but I think it's more consistent to include it on all the messages. Other thoughts? - -- Mark Sapiro <[EMAIL PROTECTED]> The highway is for gamblers, San Francisco Bay Area, California better use your sense - B. Dylan -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (MingW32) iD8DBQFIXHWgVVuXXpU7hpMRArJoAKDQFTKTBbtBVFT4s7ZeZXwYZt6J1QCfVF3n CRe+XfMTdYYaTJBstZ9e/+s= =k8o+ -----END PGP SIGNATURE-----
=== modified file 'Mailman/Queue/BounceRunner.py' --- Mailman/Queue/BounceRunner.py 2007-11-19 20:30:51 +0000 +++ Mailman/Queue/BounceRunner.py 2008-06-21 02:39:32 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2006 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2008 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 @@ -227,8 +227,10 @@ # If that still didn't return us any useful addresses, then send it on # or discard it. if not addrs: - syslog('bounce', 'bounce message w/no discernable addresses: %s', - msg.get('message-id')) + syslog('bounce', + '%s: bounce message w/no discernable addresses: %s', + mlist.internal_name(), + msg.get('message-id', 'n/a')) maybe_forward(mlist, msg) return # BAW: It's possible that there are None's in the list of addresses, @@ -330,8 +332,12 @@ """), subject=_('Uncaught bounce notification'), tomoderators=0) - syslog('bounce', 'forwarding unrecognized, message-id: %s', + syslog('bounce', + '%s: forwarding unrecognized, message-id: %s', + mlist.internal_name(), msg.get('message-id', 'n/a')) else: - syslog('bounce', 'discarding unrecognized, message-id: %s', + syslog('bounce', + '%s: discarding unrecognized, message-id: %s', + mlist.internal_name(), msg.get('message-id', 'n/a'))
BounceRunner.patch.txt.sig
Description: Binary data
_______________________________________________ Mailman-Developers mailing list Mailman-Developers@python.org http://mail.python.org/mailman/listinfo/mailman-developers Mailman FAQ: http://www.python.org/cgi-bin/faqw-mm.py Searchable Archives: http://www.mail-archive.com/mailman-developers%40python.org/ Unsubscribe: http://mail.python.org/mailman/options/mailman-developers/archive%40jab.org Security Policy: http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq01.027.htp