diff options
| -rw-r--r-- | Mailman/Queue/OutgoingRunner.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index f4803ab8a..8594557c2 100644 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py @@ -26,6 +26,7 @@ from Mailman import Message from Mailman import Errors from Mailman import LockFile from Mailman.Queue.Runner import Runner +from Mailman.Logging.Syslog import syslog @@ -47,7 +48,7 @@ class OutgoingRunner(Runner): func(mlist, msg, msgdata) # Failsafe -- a child may have leaked through. if pid <> os.getpid(): - syslog('error', 'child process leaked through: %s' % modname) + syslog('error', 'child process leaked thru: %s', modname) os._exit(1) except Errors.SomeRecipientsFailed, e: # The delivery module being used (SMTPDirect or Sendmail) failed @@ -85,11 +86,6 @@ class OutgoingRunner(Runner): msgdata['deliver_until'] = deliver_until # Requeue return 1 - except Exception, e: - # Some other exception occurred, which we definitely did not - # expect, so set this message up for requeuing. - self._log(e) - return 1 # We've successfully completed handling of this message return 0 |