------------------------------------------------------------
revno: 1072
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sat 2008-04-26 17:56:17 -0700
message:
Made the preservation of unparseable messages conditional on
mm_cfg.QRUNNER_SAVE_BAD_MESSAGES.
Changed the queue for preservation of undequeueable entries from 'shunt' to
'bad'.
modified:
Mailman/Queue/Runner.py
Mailman/Queue/Switchboard.py
=== modified file 'Mailman/Queue/Runner.py'
--- a/Mailman/Queue/Runner.py 2007-05-08 03:16:04 +0000
+++ b/Mailman/Queue/Runner.py 2008-04-27 00:56:17 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-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
@@ -103,12 +103,18 @@
# but other problems can occur in message parsing, e.g.
# ValueError, and exceptions can occur in unpickling too.
# We don't want the runner to die, so we just log and skip
- # this entry, but preserve it for analysis.
+ # this entry, but maybe preserve it for analysis.
self._log(e)
- syslog('error',
- 'Skipping and preserving unparseable message: %s',
- filebase)
- self._switchboard.finish(filebase, preserve=True)
+ if mm_cfg.QRUNNER_SAVE_BAD_MESSAGES:
+ syslog('error',
+ 'Skipping and preserving unparseable message: %s',
+ filebase)
+ preserve=True
+ else:
+ syslog('error',
+ 'Ignoring unparseable message: %s', filebase)
+ preserve=False
+ self._switchboard.finish(filebase, preserve=preserve)
continue
try:
self._onefile(msg, msgdata)
=== modified file 'Mailman/Queue/Switchboard.py'
--- a/Mailman/Queue/Switchboard.py 2008-02-14 16:53:52 +0000
+++ b/Mailman/Queue/Switchboard.py 2008-04-27 00:56:17 +0000
@@ -169,13 +169,13 @@
bakfile = os.path.join(self.__whichq, filebase + '.bak')
try:
if preserve:
- psvfile = os.path.join(mm_cfg.SHUNTQUEUE_DIR, filebase +
'.psv')
+ psvfile = os.path.join(mm_cfg.BADQUEUE_DIR, filebase + '.psv')
# Create the directory if it doesn't yet exist.
# Copied from __init__.
omask = os.umask(0) # rwxrws---
try:
try:
- os.mkdir(mm_cfg.SHUNTQUEUE_DIR, 0770)
+ os.mkdir(mm_cfg.BADQUEUE_DIR, 0770)
except OSError, e:
if e.errno <> errno.EEXIST: raise
finally:
--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
