summaryrefslogtreecommitdiff
path: root/addons/base_crypt/crypt.py
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-06-26 23:06:12 +0200
committerAntony Lesuisse <al@openerp.com>2012-06-26 23:06:12 +0200
commit54ffabf13e4adc8a05afa5fb71e48935459e8630 (patch)
tree19d9015107fa1114f1e6068807223742cb0dac4f /addons/base_crypt/crypt.py
parent7a96ae2a093613d2324b915e35e5d9ec2c86a358 (diff)
parent2e7c2174978e0ef73034453efce5a9a404d0a504 (diff)
[MERGE] fix warnings and logging
bzr revid: al@openerp.com-20120626210612-o47a2v6tlb9k4212
Diffstat (limited to 'addons/base_crypt/crypt.py')
-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: