diff options
| author | bwarsaw | 2006-04-17 04:08:17 +0000 |
|---|---|---|
| committer | bwarsaw | 2006-04-17 04:08:17 +0000 |
| commit | 0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (patch) | |
| tree | 7b710a785331abfe28b5b46a7695e6cbd81b7794 /Mailman/Cgi/options.py | |
| parent | 9934c9b2b0e76a0b77b7869ecf68cd960d4d5bd7 (diff) | |
| download | mailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.tar.gz mailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.tar.zst mailman-0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0.zip | |
Diffstat (limited to 'Mailman/Cgi/options.py')
| -rw-r--r-- | Mailman/Cgi/options.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 98e1ae958..b2d63735f 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -22,6 +22,7 @@ import cgi import sys import signal import urllib +import logging from types import ListType @@ -33,7 +34,6 @@ from Mailman import mm_cfg from Mailman import Utils from Mailman.htmlformat import * -from Mailman.Logging.Syslog import syslog SLASH = '/' SETLANGUAGE = -1 @@ -42,6 +42,9 @@ SETLANGUAGE = -1 _ = i18n._ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) +log = logging.getLogger('mailman.error') +mlog = logging.getLogger('mailman.mischief') + def main(): @@ -75,7 +78,7 @@ def main(): doc.AddItem('<hr>') doc.AddItem(MailmanLogo()) print doc.Format() - syslog('error', 'No such list "%s": %s\n', listname, e) + log.error('No such list "%s": %s\n', listname, e) return # The total contents of the user's response @@ -183,9 +186,8 @@ def main(): # Public rosters doc.addError(_('No such member: %(safeuser)s.')) else: - syslog('mischief', - 'Unsub attempt of non-member w/ private rosters: %s', - user) + mlog.error('Unsub attempt of non-member w/ private rosters: %s', + user) doc.addError(_('The confirmation email has been sent.'), tag='') loginpage(mlist, doc, user, language) @@ -205,9 +207,9 @@ def main(): # Public rosters doc.addError(_('No such member: %(safeuser)s.')) else: - syslog('mischief', - 'Reminder attempt of non-member w/ private rosters: %s', - user) + mlog.error( + 'Reminder attempt of non-member w/ private rosters: %s', + user) doc.addError( _('A reminder of your password has been emailed to you.'), tag='') @@ -242,9 +244,7 @@ def main(): # So as not to allow membership leakage, prompt for the email # address and the password here. if mlist.private_roster <> 0: - syslog('mischief', - 'Login failure with private rosters: %s', - user) + mlog.error('Login failure with private rosters: %s', user) user = None loginpage(mlist, doc, user, language) print doc.Format() |
