← Back to branch summary

~futatuki/mailman/2.1-listinfo-overview-client-lang

« back to all changes in this revision

Viewing changes to Mailman/Queue/OutgoingRunner.py

  • Committer: Yasuhito FUTATSUKI at POEM
  • Date: 2018-06-21 07:40:59 UTC
  • mfrom: (1654.3.103 2.1)
  • Revision ID: futatuki@poem.co.jp-20180621074059-qq53235k6748x5yr
merge lp:mailman/2.1 up to rev 1781

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Queue/OutgoingRunner.py
1
 
# Copyright (C) 2000-2017 by the Free Software Foundation, Inc.
 
1
# Copyright (C) 2000-2018 by the Free Software Foundation, Inc.
2
2
#
3
3
# This program is free software; you can redistribute it and/or
4
4
# modify it under the terms of the GNU General Public License
122
122
                        # disposition?
123
123
                        if now > deliver_until:
124
124
                            return False
125
 
                        # We're going to retry, but not too soon.
126
 
                        deliver_after = now + mm_cfg.DELIVERY_RETRY_WAIT
127
 
                        msgdata['deliver_after'] = deliver_after
128
125
                    else:
129
126
                        # Keep trying to delivery this message for a while
130
127
                        deliver_until = now + mm_cfg.DELIVERY_RETRY_PERIOD
 
128
                    # Don't retry delivery too soon.
 
129
                    deliver_after = now + mm_cfg.DELIVERY_RETRY_WAIT
 
130
                    msgdata['deliver_after'] = deliver_after
131
131
                    msgdata['last_recip_count'] = len(recips)
132
132
                    msgdata['deliver_until'] = deliver_until
133
133
                    msgdata['recips'] = recips