aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/ListAdmin.py
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2009-12-04 14:25:28 -0800
committerMark Sapiro <mark@msapiro.net>2009-12-04 14:25:28 -0800
commit7cc048257bc4e26af8e7dfe8a21fb24b77109302 (patch)
tree90a921f5e04bd7f58ef44715274ec7fddf139b37 /Mailman/ListAdmin.py
parent437e19bde3fe5e6fdccb0ec79ba0726190f4fd19 (diff)
downloadmailman2-7cc048257bc4e26af8e7dfe8a21fb24b77109302.tar.gz
mailman2-7cc048257bc4e26af8e7dfe8a21fb24b77109302.tar.xz
mailman2-7cc048257bc4e26af8e7dfe8a21fb24b77109302.zip
- 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.
Diffstat (limited to 'Mailman/ListAdmin.py')
-rw-r--r--Mailman/ListAdmin.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index a290a358..714b2405 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -410,11 +410,14 @@ class ListAdmin:
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 @@ class ListAdmin:
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: