------------------------------------------------------------
revno: 1727
fixes bug: https://launchpad.net/bugs/1729472
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Thu 2017-11-02 20:39:50 -0700
message:
The DELIVERY_RETRY_WAIT setting is now effective.
modified:
Mailman/Defaults.py.in
Mailman/Queue/OutgoingRunner.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2017-05-23 19:45:06 +0000
+++ Mailman/Defaults.py.in 2017-11-03 03:39:50 +0000
@@ -1522,6 +1522,9 @@
DELIVERY_RETRY_PERIOD = days(5)
# How long should we wait before we retry a temporary delivery failure?
+# Because RetryRunner sleeps for 15 minutes between processes of its queue,
+# whatever is put here is effectively rounded up to the next integer multiple
+# of 15 minutes.
DELIVERY_RETRY_WAIT = hours(1)
=== modified file 'Mailman/Queue/OutgoingRunner.py'
--- Mailman/Queue/OutgoingRunner.py 2012-06-20 23:32:30 +0000
+++ Mailman/Queue/OutgoingRunner.py 2017-11-03 03:39:50 +0000
@@ -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 @@
# 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
=== modified file 'NEWS'
--- NEWS 2017-10-26 20:59:01 +0000
+++ NEWS 2017-11-03 03:39:50 +0000
@@ -5,6 +5,12 @@
Here is a history of user visible changes to Mailman.
+2.1.26 (xx-xxx-xxxx)
+
+ Bug fixes and other patches
+
+ - The DELIVERY_RETRY_WAIT setting is now effective. (LP: #1729472)
+
2.1.25 (26-Oct-2017)
New Features
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
