diff options
| author | bwarsaw | 2003-09-12 13:48:34 +0000 |
|---|---|---|
| committer | bwarsaw | 2003-09-12 13:48:34 +0000 |
| commit | ce61a198d9a9d6028c4e9f7dda7e1b3d25435083 (patch) | |
| tree | 69b64d8189d9848d759993e7529fd1a23fcccb9a /Mailman/Queue/Runner.py | |
| parent | eac31fc24a64a7a4a3a4ba3d412effb3e8ea519d (diff) | |
| download | mailman-ce61a198d9a9d6028c4e9f7dda7e1b3d25435083.tar.gz mailman-ce61a198d9a9d6028c4e9f7dda7e1b3d25435083.tar.zst mailman-ce61a198d9a9d6028c4e9f7dda7e1b3d25435083.zip | |
_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>.
Diffstat (limited to 'Mailman/Queue/Runner.py')
| -rw-r--r-- | Mailman/Queue/Runner.py | 8 |
1 files 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 |