From ce61a198d9a9d6028c4e9f7dda7e1b3d25435083 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Fri, 12 Sep 2003 13:48:34 +0000
Subject: _oneloop(): Print the shunt log message after enqueing the file, so
 that we get the correct (new) filebase of the shunted message.  This makes
 finding the correlation between log messages and the offending message files
 actually possible <wink>.

---
 Mailman/Queue/Runner.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mailman/Queue/Runner.py b/Mailman/Queue/Runner.py
index c41a98f3b..8b5bddcb5 100644
--- a/Mailman/Queue/Runner.py
+++ b/Mailman/Queue/Runner.py
@@ -110,12 +110,12 @@ class Runner:
                     self._onefile(msg, msgdata)
                 except Exception, e:
                     self._log(e)
-                    syslog('error', 'SHUNTING: %s', filebase)
                     # Put a marker in the metadata for unshunting
                     msgdata['whichq'] = self._switchboard.whichq()
-                    self._shunt.enqueue(msg, msgdata)
+                    filebase = self._shunt.enqueue(msg, msgdata)
+                    syslog('error', 'SHUNTING: %s', filebase)
             # Other work we want to do each time through the loop
-            Utils.reap(self._kids, once=1)
+            Utils.reap(self._kids, once=True)
             self._doperiodic()
             if self._shortcircuit():
                 break
@@ -177,7 +177,7 @@ class Runner:
         mlist = self._listcache.get(listname)
         if not mlist:
             try:
-                mlist = MailList.MailList(listname, lock=0)
+                mlist = MailList.MailList(listname, lock=False)
             except Errors.MMListError, e:
                 syslog('error', 'error opening list: %s\n%s', listname, e)
                 return None
-- 
cgit v1.3.1