------------------------------------------------------------
revno: 1085
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Fri 2009-12-04 14:23:14 -0800
message:
- Added vette logging for rejected and discarded (un)subscribe requests.
- Fixed a bug in admindb.py that could erroneously discard an unsubscribe
request as a duplicate.
modified:
Mailman/Cgi/admindb.py
Mailman/ListAdmin.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription.
=== modified file 'Mailman/Cgi/admindb.py'
--- Mailman/Cgi/admindb.py 2009-02-03 23:47:36 +0000
+++ Mailman/Cgi/admindb.py 2009-12-04 22:23:14 +0000
@@ -340,7 +340,7 @@
# Alphabetical order by email address
byaddrs = {}
for id in pendingunsubs:
- addr = mlist.GetRecord(id)[1]
+ addr = mlist.GetRecord(id)
byaddrs.setdefault(addr, []).append(id)
addrs = byaddrs.keys()
addrs.sort()
=== modified file 'Mailman/ListAdmin.py'
--- Mailman/ListAdmin.py 2009-12-04 01:06:11 +0000
+++ Mailman/ListAdmin.py 2009-12-04 22:23:14 +0000
@@ -410,11 +410,14 @@
if value == mm_cfg.DEFER:
return DEFER
elif value == mm_cfg.DISCARD:
- pass
+ syslog('vette', '%s: discarded subscription request from %s',
+ self.internal_name(), addr)
elif value == mm_cfg.REJECT:
self.__refuse(_('Subscription request'), addr,
comment or _('[No reason given]'),
lang=lang)
+ syslog('vette', """%s: rejected subscription request from %s
+\tReason: %s""", self.internal_name(), addr, comment or '[No reason given]')
else:
# subscribe
assert value == mm_cfg.SUBSCRIBE
@@ -462,9 +465,12 @@
if value == mm_cfg.DEFER:
return DEFER
elif value == mm_cfg.DISCARD:
- pass
+ syslog('vette', '%s: discarded unsubscription request from %s',
+ self.internal_name(), addr)
elif value == mm_cfg.REJECT:
self.__refuse(_('Unsubscription request'), addr, comment)
+ syslog('vette', """%s: rejected unsubscription request from %s
+\tReason: %s""", self.internal_name(), addr, comment or '[No reason given]')
else:
assert value == mm_cfg.UNSUBSCRIBE
try:
=== modified file 'NEWS'
--- NEWS 2009-12-04 01:06:11 +0000
+++ NEWS 2009-12-04 22:23:14 +0000
@@ -78,6 +78,11 @@
Bug Fixes and other patches
+ - Added vette logging for rejected and discarded (un)subscribe requests.
+
+ - Fixed a bug in admindb.py that could erroneously discard an unsubscribe
+ request as a duplicate.
+
- Decoded RFC 2047 encoded message subjects for a few reports.
Bug #266428.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
