diff options
| author | tkikuchi <> | 2004-10-22 07:01:30 +0000 |
|---|---|---|
| committer | tkikuchi <> | 2004-10-22 07:01:30 +0000 |
| commit | 5219c266f387e459a74920987f6eb794c5a33293 (patch) | |
| tree | 368ec073fdc41b07e1f0ad6370b9319d5544ee52 /Mailman/Bouncer.py | |
| parent | 1463939e850eb6fe216b88e07c2fb93a23c32f14 (diff) | |
| download | mailman2-5219c266f387e459a74920987f6eb794c5a33293.tar.gz mailman2-5219c266f387e459a74920987f6eb794c5a33293.tar.xz mailman2-5219c266f387e459a74920987f6eb794c5a33293.zip | |
Now default is NOT to VERP_PROBES for backward compatibility.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Bouncer.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index 9f786eb4..451f11fc 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -151,11 +151,15 @@ class Bouncer: # Now that we've adjusted the bounce score for this bounce, let's # check to see if the disable-by-bounce threshold has been reached. if info.score >= self.bounce_score_threshold: - syslog('bounce', 'sending %s list probe to: %s (score %s >= %s)', + if mm_cfg.VERP_PROBES: + syslog('bounce', + 'sending %s list probe to: %s (score %s >= %s)', self.internal_name(), member, info.score, self.bounce_score_threshold) - self.sendProbe(member, msg) - info.reset(0, info.date, info.noticesleft) + self.sendProbe(member, msg) + info.reset(0, info.date, info.noticesleft) + else: + self.disableBouncingMember(member, info, msg) def disableBouncingMember(self, member, info, msg): # Initialize their confirmation cookie. If we do it when we get the @@ -163,8 +167,13 @@ class Bouncer: cookie = self.pend_new(Pending.RE_ENABLE, self.internal_name(), member) info.cookie = cookie # Disable them - syslog('bounce', '%s: %s disabling due to probe bounce received', - self.internal_name(), member) + if mm_cfg.VERP_PROBES: + syslog('bounce', '%s: %s disabling due to probe bounce received', + self.internal_name(), member) + else: + syslog('bounce', '%s: %s disabling due to bounce score %s >= %s', + self.internal_name(), member, + info.score, self.bounce_score_threshold) self.setDeliveryStatus(member, MemberAdaptor.BYBOUNCE) self.sendNextNotification(member) if self.bounce_notify_owner_on_disable: |