[IMP] openerp.{modules,osv}: _logger with fully qualified module name.

bzr revid: vmt@openerp.com-20120124124252-91g3ysf33zsq4nhd

1 files changed, 8 insertions, 10 deletions

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index c75ab814254..124634efa7d 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -54,7 +54,7 @@ ad_paths = []
 # Modules already loaded
 loaded = []
 
-logger = netsvc.Logger()
+_logger = logging.getLogger(__name__)
 
 class AddonsImportHook(object):
     """
@@ -98,8 +98,7 @@ class AddonsImportHook(object):
             try:
                 # Check if the bare module name clashes with another module.
                 f, path, descr = imp.find_module(module_parts[0])
-                logger = logging.getLogger('init')
-                logger.warning("""
+                _logger.warning("""
 Ambiguous import: the OpenERP module `%s` is shadowed by another
 module (available at %s).
 To import it, use `import openerp.addons.<module>.`.""" % (module_name, path))
@@ -174,7 +173,7 @@ def get_module_path(module, downloaded=False, display_warning=True):
     if downloaded:
         return opj(_ad, module)
     if display_warning:
-        logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: module not found' % (module,))
+        _logger.warning('module %s: module not found', module)
     return False
 
 
@@ -346,7 +345,7 @@ def load_information_from_description_file(module):
 
     #TODO: refactor the logger in this file to follow the logging guidelines
     #      for 6.0
-    logging.getLogger('modules').debug('module %s: no descriptor file'
+    _logger.debug('module %s: no descriptor file'
         ' found: __openerp__.py or __terp__.py (deprecated)', module)
     return {}
 
@@ -360,8 +359,7 @@ def init_module_models(cr, module_name, obj_list):
     TODO better explanation of _auto_init and init.
 
     """
-    logger.notifyChannel('init', netsvc.LOG_INFO,
-        'module %s: creating or updating database tables' % module_name)
+    _logger.info('module %s: creating or updating database tables', module_name)
     todo = []
     for obj in obj_list:
         result = obj._auto_init(cr, {'module': module_name})
@@ -389,13 +387,13 @@ def register_module_classes(m):
     def log(e):
         mt = isinstance(e, zipimport.ZipImportError) and 'zip ' or ''
         msg = "Couldn't load %smodule %s" % (mt, m)
-        logger.notifyChannel('init', netsvc.LOG_CRITICAL, msg)
-        logger.notifyChannel('init', netsvc.LOG_CRITICAL, e)
+        _logger.critical(msg)
+        _logger.critical(e)
 
     global loaded
     if m in loaded:
         return
-    logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: registering objects' % m)
+    _logger.info('module %s: registering objects', m)
     mod_path = get_module_path(m)
 
     initialize_sys_path()