diff options
| author | Barry Warsaw | 2016-03-25 18:03:12 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2016-03-25 18:03:12 -0400 |
| commit | 077a49a823af227c7038f9533eb8d9d55571bbe7 (patch) | |
| tree | dd0d2710a8bad8da08b085ffc611fdd8f9642813 /src/mailman/runners/outgoing.py | |
| parent | 142aca81121ec885d70ed74ea5a6b76ecf05221b (diff) | |
| download | mailman-077a49a823af227c7038f9533eb8d9d55571bbe7.tar.gz mailman-077a49a823af227c7038f9533eb8d9d55571bbe7.tar.zst mailman-077a49a823af227c7038f9533eb8d9d55571bbe7.zip | |
Diffstat (limited to 'src/mailman/runners/outgoing.py')
| -rw-r--r-- | src/mailman/runners/outgoing.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mailman/runners/outgoing.py b/src/mailman/runners/outgoing.py index 98c484e3f..3f21e3813 100644 --- a/src/mailman/runners/outgoing.py +++ b/src/mailman/runners/outgoing.py @@ -17,16 +17,12 @@ """Outgoing runner.""" -__all__ = [ - 'OutgoingRunner', - ] - - import socket import logging from datetime import datetime from lazr.config import as_boolean, as_timedelta +from mailman import public from mailman.config import config from mailman.core.runner import Runner from mailman.interfaces.bounce import BounceContext, IBounceProcessor @@ -49,7 +45,7 @@ smtp_log = logging.getLogger('mailman.smtp') debug_log = logging.getLogger('mailman.debug') - +@public class OutgoingRunner(Runner): """The outgoing runner.""" @@ -92,7 +88,7 @@ class OutgoingRunner(Runner): # VERP every 'interval' number of times. msgdata['verp'] = (mlist.post_id % interval == 0) try: - debug_log.debug('[outgoing] {0}: {1}'.format( + debug_log.debug('[outgoing] {}: {}'.format( self._func, msg.get('message-id', 'n/a'))) self._func(mlist, msg, msgdata) self._logged = False @@ -154,7 +150,7 @@ class OutgoingRunner(Runner): if current_time > deliver_until: smtp_log.error('Discarding message with ' 'persistent temporary failures: ' - '{0}'.format(msg['message-id'])) + '{}'.format(msg['message-id'])) return False else: # We made some progress, so keep trying to delivery |
