summaryrefslogtreecommitdiff
path: root/addons/base_crypt
diff options
context:
space:
mode:
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>2012-06-27 17:58:48 +0530
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>2012-06-27 17:58:48 +0530
commit942b330cde9c865540a0c551bbdfb05574f237a4 (patch)
tree359a4bb4e9fafb63d4398a444b595a861466363c /addons/base_crypt
parentf89c6f0a0b5be2b76fcd4735b9a05616c0191099 (diff)
parent7c645856fe8dc05c237d070c98c4c22641776a2c (diff)
[MERGE]
bzr revid: rma@tinyerp.com-20120627122848-8o1307hing540vq2
Diffstat (limited to 'addons/base_crypt')
-rw-r--r--addons/base_crypt/crypt.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 9b91f7d3108..8a9d1ac1dc7 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -42,8 +42,10 @@ from osv import fields,osv
import pooler
from tools.translate import _
from service import security
+import logging
magic_md5 = '$1$'
+_logger = logging.getLogger(__name__)
def gen_salt( length=8, symbols=ascii_letters + digits ):
seed()
@@ -179,8 +181,7 @@ class users(osv.osv):
cr = pooler.get_db(db).cursor()
return self._login(cr, db, login, password)
except Exception:
- import logging
- logging.getLogger('netsvc').exception('Could not authenticate')
+ _logger.exception('Could not authenticate')
return Exception('Access Denied')
finally:
if cr is not None: