diff options
author | Mark Sapiro <mark@msapiro.net> | 2017-11-02 20:39:50 -0700 |
---|---|---|
committer | Mark Sapiro <mark@msapiro.net> | 2017-11-02 20:39:50 -0700 |
commit | 39a8ffb7dd8ff13871ec17b6950d44254f1c9306 (patch) | |
tree | cf20030d9baf4fa26a6db6dd9bfcb877fddf33e0 /Mailman/Queue | |
parent | bc77a098657cbc0db309de8fb9e63d079f43f955 (diff) | |
download | mailman2-39a8ffb7dd8ff13871ec17b6950d44254f1c9306.tar.gz mailman2-39a8ffb7dd8ff13871ec17b6950d44254f1c9306.tar.xz mailman2-39a8ffb7dd8ff13871ec17b6950d44254f1c9306.zip |
The DELIVERY_RETRY_WAIT setting is now effective.
Diffstat (limited to 'Mailman/Queue')
-rwxr-xr-x | Mailman/Queue/OutgoingRunner.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index defaf02d..0a204e66 100755 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2012 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2017 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 @@ -122,6 +122,9 @@ class OutgoingRunner(Runner, BounceMixin): # disposition? if now > deliver_until: return False + # We're going to retry, but not too soon. + deliver_after = now + mm_cfg.DELIVERY_RETRY_WAIT + msgdata['deliver_after'] = deliver_after else: # Keep trying to delivery this message for a while deliver_until = now + mm_cfg.DELIVERY_RETRY_PERIOD |