From 4f6bc445a99dde634c1b1ad51c32add4649f6e5b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 1 Aug 2011 10:55:06 +0200
Subject: [PATCH] [IMP] use logging in db initialization

bzr revid: xmo@openerp.com-20110801085506-5qjuq36mx3ql7b93
---
 openerp/modules/loading.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index b24f4888424..7726960bd47 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -81,6 +81,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
        :param skip_modules: optional list of module names (packages) which have previously been loaded and can be skipped
        :return: list of modules that were installed or updated
     """
+    logger = logging.getLogger('init.load')
     def process_sql_file(cr, fp):
         queries = fp.read().split(';')
         for query in queries:
@@ -109,7 +110,8 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
             try:
                 _load_data(cr, module_name, idref, mode, 'test')
             except Exception, e:
-                logging.getLogger('test').exception('Tests failed to execute in module %s', module_name)
+                logging.getLogger('init.test').exception(
+                    'Tests failed to execute in module %s', module_name)
             finally:
                 if tools.config.options['test_commit']:
                     cr.commit()
@@ -126,8 +128,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
 
         """
         for filename in package.data[kind]:
-            log = logging.getLogger('init')
-            log.info("module %s: loading %s", module_name, filename)
+            logger.info("module %s: loading %s", module_name, filename)
             _, ext = os.path.splitext(filename)
             pathname = os.path.join(module_name, filename)
             fp = tools.file_open(pathname)
@@ -155,7 +156,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
     loaded_modules = []
     pool = pooler.get_pool(cr.dbname)
     migrations = openerp.modules.migration.MigrationManager(cr, graph)
-    logger.notifyChannel('init', netsvc.LOG_DEBUG, 'loading %d packages..' % len(graph))
+    logger.debug('loading %d packages...', len(graph))
 
     # register, instantiate and initialize models for each modules
     for index, package in enumerate(graph):
@@ -165,7 +166,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
         if skip_modules and module_name in skip_modules:
             continue
 
-        logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % package.name)
+        logger.info('module %s: loading objects', package.name)
         migrations.migrate_module(package, 'pre')
         register_module_classes(package.name)
         models = pool.instanciate(package.name, cr)