diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-06-27 13:25:08 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-06-27 13:25:08 +0530 |
| commit | 18dd2dfcab7ee866f5e344ea5c26d4e78faba2f2 (patch) | |
| tree | 068dcc026be4048b1bf56df1c6a61a28dcf34b0c /addons/base_crypt | |
| parent | ea46eb264517fac17720f3a9a524c766e891ac1d (diff) | |
| parent | 6c0bdc167b1c6a5b2cbb36a045bfd1abc1cd121a (diff) | |
[MERGE] Merged from openobject-addons.
bzr revid: jra@tinyerp.com-20120627075508-kko9c9dr67695hzw
Diffstat (limited to 'addons/base_crypt')
| -rw-r--r-- | addons/base_crypt/crypt.py | 5 |
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: |