[FIX] review according to xmo :)

bzr revid: al@openerp.com-20120201235604-tr5iq676pzk8bi1m

6 files changed, 15 insertions, 17 deletions

diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index 031ccfc98b4..3efd660a9ec 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -131,8 +131,8 @@ class ir_cron(osv.osv):
         if model and hasattr(model, method_name):
             method = getattr(model, method_name)
             try:
-                netsvc.log(__name__, (cr.dbname,uid,'*',model_name,method_name)+tuple(args), channel=logging.DEBUG,
-                            depth=(None if _logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) else 1), fn='object.execute')
+                log_depth = (None if _logger.isEnabledFor(logging.DEBUG) else 1)
+                netsvc.log(_logger, logging.DEBUG, 'cron.object.execute', (cr.dbname,uid,'*',model_name,method_name)+tuple(args), depth=log_depth)
                 if _logger.isEnabledFor(logging.DEBUG):
                     start_time = time.time()
                 method(cr, uid, *args)
diff --git a/openerp/loglevels.py b/openerp/loglevels.py
index 60dce61e551..2b0d40d1406 100644
--- a/openerp/loglevels.py
+++ b/openerp/loglevels.py
@@ -48,7 +48,7 @@ class Logger(object):
             "the standard `logging` module instead.")
         from service.web_services import common
 
-        log = logging.getLogger(__name__ + '(deprecated channel: ' + ustr(name) + ')')
+        log = logging.getLogger(__name__ + '.deprecated.' + ustr(name))
 
         if level in [LOG_DEBUG_RPC, LOG_TEST] and not hasattr(log, level):
             fct = lambda msg, *args, **kwargs: log.log(getattr(logging, level.upper()), msg, *args, **kwargs)
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index ff38fceb142..0305c85f1c0 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -151,7 +151,6 @@ def init_logger():
     resetlocale()
 
     # create a format for log messages and dates
-    format = '[%(asctime)s][%(dbname)s] %(levelname)s:%(name)s:%(message)s'
     format = '%(asctime)s %(pid)s %(levelname)s %(dbname)s %(name)s: %(message)s'
 
     if tools.config['syslog']:
@@ -191,14 +190,14 @@ def init_logger():
 
     # Configure handlers
     logconfig = tools.config['log_handler']
-    for i in logconfig:
-        prefix, level = i.split(':')
+    for logconfig_item in logconfig:
+        loggername, level = logconfig_item.split(':')
         level = getattr(logging, level, logging.INFO)
-        logger = logging.getLogger(prefix)
+        logger = logging.getLogger(loggername)
         logger.handlers = []
         logger.setLevel(level)
         logger.addHandler(handler)
-        if prefix != '':
+        if loggername != '':
             logger.propagate = False
 
 
@@ -302,11 +301,11 @@ def replace_request_password(args):
         args[2] = '*'
     return tuple(args)
 
-def dispatch_rpc_log(logger, prefix, msg, depth=None):
+def log(logger, level, prefix, msg, depth=None):
     indent=''
     indent_after=' '*len(prefix)
     for line in (prefix+pformat(msg, depth=depth)).split('\n'):
-        logger.debug(indent+line)
+        logger.log(level, indent+line)
         indent=indent_after
 
 def dispatch_rpc(service_name, method, params):
@@ -323,16 +322,16 @@ def dispatch_rpc(service_name, method, params):
         if rpc_short_flag or rpc_full_flag:
             start_time = time.time()
             if rpc_full_flag:
-                dispatch_rpc_log(rpc_full,'%s.%s:request '%(service_name,method), replace_request_password(params))
+                log(rpc_full,logging.DEBUG,'%s.%s:request '%(service_name,method), replace_request_password(params))
 
         result = ExportService.getService(service_name).dispatch(method, params)
 
         if rpc_short_flag or rpc_full_flag:
             end_time = time.time()
             if rpc_full_flag:
-                dispatch_rpc_log(rpc_full,'%s.%s:reply time:%.3fs '%(service_name,method,end_time - start_time), result)
+                log(rpc_full,logging.DEBUG,'%s.%s:reply time:%.3fs '%(service_name,method,end_time - start_time), result)
             else:
-                dispatch_rpc_log(rpc_short,'%s.%s time:%.3fs '%(service_name,method,end_time - start_time), replace_request_password(params), depth=1)
+                log(rpc_short,logging.DEBUG,'%s.%s time:%.3fs '%(service_name,method,end_time - start_time), replace_request_password(params), depth=1)
 
         return result
     except openerp.exceptions.AccessError:
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c8362f8eafa..355fcf7d1fa 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -65,7 +65,7 @@ from openerp import SUPERUSER_ID
 from query import Query
 
 _logger = logging.getLogger(__name__)
-_schema = logging.getLogger(__name__ + '(schema)')
+_schema = logging.getLogger(__name__ + '.schema')
 
 # List of etree._Element subclasses that we choose to ignore when parsing XML.
 from openerp.tools import SKIPPED_ELEMENT_TYPES
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index b513336c399..ed72a520869 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -555,8 +555,8 @@ GNU Public Licence.
         return os.times()
 
     def exp_get_sqlcount(self):
-        if not _logger.isEnabledFor(logging.DEBUG_SQL):
-            _logger.warning("Counters of SQL will not be reliable unless DEBUG_SQL is set at the server's config.")
+        if not logging.getLogger('openerp.sql_db').isEnabledFor(logging.DEBUG):
+            _logger.warning("Counters of SQL will not be reliable unless logger openerp.sql_db is set to level DEBUG or higer.")
         return sql_db.sql_counter
 
 
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 4fab491755c..4b276dd2e63 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -314,7 +314,6 @@ class configmanager(object):
         if args is None:
             args = []
         opt, args = self.parser.parse_args(args)
-        print opt
 
         def die(cond, msg):
             if cond: