diff options
| author | klm | 1998-05-21 15:48:43 +0000 |
|---|---|---|
| committer | klm | 1998-05-21 15:48:43 +0000 |
| commit | f89fef03b3c1034f8ef8169554e6a29d79f6beb7 (patch) | |
| tree | 2cf57fc14f094acfb375f592a0b634b89d817623 | |
| parent | 167d8dd361bd76fd1ca48493357342beab02a15e (diff) | |
| download | mailman-f89fef03b3c1034f8ef8169554e6a29d79f6beb7.tar.gz mailman-f89fef03b3c1034f8ef8169554e6a29d79f6beb7.tar.zst mailman-f89fef03b3c1034f8ef8169554e6a29d79f6beb7.zip | |
.RegisterBounce(): I think this corrects the bounce log reporting of
the remaining number of bounces a member is allowed (within the
stipulated time frame) before exceeding the limit. If this is right,
with the other bounce-handling refinements i feel a lot more confident
about predicatable, well-mannered behavior from the bounce management
stuff...
| -rw-r--r-- | Mailman/Bouncer.py | 7 | ||||
| -rw-r--r-- | modules/mm_bouncer.py | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index b0174dec7..61d3c2533 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -1,6 +1,6 @@ "Handle delivery bounce messages, doing filtering when list is set for it." -__version__ = "$Revision: 532 $" +__version__ = "$Revision: 533 $" # It's possible to get the mail-list senders address (list-admin) in the # bounce list. You probably don't want to have list mail sent to that @@ -88,12 +88,13 @@ class Bouncer: return else: post_count = (self.minimum_post_count_before_bounce_action - - self.post_id - inf[1]) + (self.post_id - inf[1])) if post_count < 0: post_count = 0 remain = self.minimum_removal_date * 24 * 60 * 60 - difference self.LogMsg("bounce", - report + ("%d more posts, %d more secs" + report + ("%d remaining delivery failures" + " within %d secs" % (post_count, remain))) self.Save() return diff --git a/modules/mm_bouncer.py b/modules/mm_bouncer.py index b0174dec7..61d3c2533 100644 --- a/modules/mm_bouncer.py +++ b/modules/mm_bouncer.py @@ -1,6 +1,6 @@ "Handle delivery bounce messages, doing filtering when list is set for it." -__version__ = "$Revision: 532 $" +__version__ = "$Revision: 533 $" # It's possible to get the mail-list senders address (list-admin) in the # bounce list. You probably don't want to have list mail sent to that @@ -88,12 +88,13 @@ class Bouncer: return else: post_count = (self.minimum_post_count_before_bounce_action - - self.post_id - inf[1]) + (self.post_id - inf[1])) if post_count < 0: post_count = 0 remain = self.minimum_removal_date * 24 * 60 * 60 - difference self.LogMsg("bounce", - report + ("%d more posts, %d more secs" + report + ("%d remaining delivery failures" + " within %d secs" % (post_count, remain))) self.Save() return |