summaryrefslogtreecommitdiff
path: root/Mailman/Deliverer.py
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 04:08:17 +0000
committerbwarsaw2006-04-17 04:08:17 +0000
commit0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (patch)
tree7b710a785331abfe28b5b46a7695e6cbd81b7794 /Mailman/Deliverer.py
parent9934c9b2b0e76a0b77b7869ecf68cd960d4d5bd7 (diff)
downloadmailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.tar.gz
mailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.tar.zst
mailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.zip
Diffstat (limited to 'Mailman/Deliverer.py')
-rw-r--r--Mailman/Deliverer.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py
index 63f98db73..e1007e135 100644
--- a/Mailman/Deliverer.py
+++ b/Mailman/Deliverer.py
@@ -18,20 +18,23 @@
"""Mixin class with message delivery routines."""
-from email.MIMEText import MIMEText
+import logging
+
from email.MIMEMessage import MIMEMessage
+from email.MIMEText import MIMEText
from Mailman import i18n
from Mailman import Errors
from Mailman import Message
from Mailman import mm_cfg
-from Mailman import Utils
from Mailman import Pending
-
-from Mailman.Logging.Syslog import syslog
+from Mailman import Utils
_ = i18n._
+log = logging.getLogger('mailman.error')
+mlog = logging.getLogger('mailman.mischief')
+
class Deliverer:
@@ -93,8 +96,8 @@ your membership administrative address, %(addr)s.'''))
if not self.getMemberPassword(user):
# The user's password somehow got corrupted. Generate a new one
# for him, after logging this bogosity.
- syslog('error', 'User %s had a false password for list %s',
- user, self.internal_name())
+ log.error('User %s had a false password for list %s',
+ user, self.internal_name())
waslocked = self.Locked()
if not waslocked:
self.Lock()
@@ -154,8 +157,8 @@ your membership administrative address, %(addr)s.'''))
# list. We inform both list owners of the bogosity, but be careful
# not to reveal too much information.
selfname = self.internal_name()
- syslog('mischief', '%s was invited to %s but confirmed to %s',
- address, listname, selfname)
+ mlog.error('%s was invited to %s but confirmed to %s',
+ address, listname, selfname)
# First send a notice to the attacked list
msg = Message.OwnerNotification(
self,