projects
/
matthijs
/
projects
/
wipi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mysql_login: Use logger instead of request.log.
[matthijs/projects/wipi.git]
/
conf
/
auth
/
mysql_login.py
diff --git
a/conf/auth/mysql_login.py
b/conf/auth/mysql_login.py
index 95b3aa660c4e93fe9cb1a2aac0e24bf499ce4278..b34ecf95c33c2b1185b3ae1cbbf2b058bd0aa728 100644
(file)
--- a/
conf/auth/mysql_login.py
+++ b/
conf/auth/mysql_login.py
@@
-10,12
+10,14
@@
import MySQLdb
import md5
from MoinMoin import user
from MoinMoin.auth import BaseAuth, ContinueLogin
import md5
from MoinMoin import user
from MoinMoin.auth import BaseAuth, ContinueLogin
+from MoinMoin import log
+logging = log.getLogger(__name__)
class mysql_login(BaseAuth):
logout_possible = True
login_inputs = ['username', 'password']
class mysql_login(BaseAuth):
logout_possible = True
login_inputs = ['username', 'password']
- def __init__(self, name='mysql', dbhost=None, dbuser=None, dbpass=None, dbname=None, dbport=None,
verbose=False,
hint=None):
+ def __init__(self, name='mysql', dbhost=None, dbuser=None, dbpass=None, dbname=None, dbport=None, hint=None):
"""
Authenticate using credentials from a mysql database
"""
Authenticate using credentials from a mysql database
@@
-23,7
+25,6
@@
class mysql_login(BaseAuth):
The hint parameter is a snippet of HTML that is displayed below the login form.
"""
The hint parameter is a snippet of HTML that is displayed below the login form.
"""
- self.verbose = verbose
self.dbhost = dbhost
self.dbuser = dbuser
self.dbpass = dbpass
self.dbhost = dbhost
self.dbuser = dbuser
self.dbpass = dbpass
@@
-87,8
+88,8
@@
class mysql_login(BaseAuth):
import sys
import traceback
info = sys.exc_info()
import sys
import traceback
info = sys.exc_info()
-
request.log
("mysql_login: authentication failed due to exception connecting to DB, traceback follows...")
-
request.log
(''.join(traceback.format_exception(*info)))
+
logging.error
("mysql_login: authentication failed due to exception connecting to DB, traceback follows...")
+
logging.error
(''.join(traceback.format_exception(*info)))
return False
return conn
return False
return conn
@@
-98,7
+99,7
@@
class mysql_login(BaseAuth):
username = kw.get('username')
password = kw.get('password')
username = kw.get('username')
password = kw.get('password')
-
if self.verbose: request.lo
g("mysql_login: Trying to log in, username=%r " % (username))
+
logging.debu
g("mysql_login: Trying to log in, username=%r " % (username))
# simply continue if something else already logged in
# successfully
# simply continue if something else already logged in
# successfully
@@
-113,10
+114,10
@@
class mysql_login(BaseAuth):
# Login incorrect
if (not email):
# Login incorrect
if (not email):
-
if self.verbose: request.lo
g("mysql_login: authentication failed for %s" % (username))
+
logging.debu
g("mysql_login: authentication failed for %s" % (username))
return ContinueLogin(user_obj)
return ContinueLogin(user_obj)
-
if self.verbose: request.lo
g("mysql_login: authenticated %s (email %s)" % (username, email))
+
logging.debu
g("mysql_login: authenticated %s (email %s)" % (username, email))
u = user.User(request, auth_username=username, auth_method=self.name, auth_attribs=('name', 'password', 'email'))
u.email = email
u = user.User(request, auth_username=username, auth_method=self.name, auth_attribs=('name', 'password', 'email'))
u.email = email
@@
-128,8
+129,8
@@
class mysql_login(BaseAuth):
import sys
import traceback
info = sys.exc_info()
import sys
import traceback
info = sys.exc_info()
-
request.log
("mysql_login: authentication failed due to unexpected exception, traceback follows...")
-
request.log
(''.join(traceback.format_exception(*info)))
+
logging.error
("mysql_login: authentication failed due to unexpected exception, traceback follows...")
+
logging.error
(''.join(traceback.format_exception(*info)))
return ContinueLogin(user_obj)
def login_hint(self, request):
return ContinueLogin(user_obj)
def login_hint(self, request):