X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=openerp%2Fnetsvc.py;h=506c1e4bcba5c3687fb9f21d1232d89a7515306e;hb=f05c4faf5b40910d25ceda3506d6e3bc090fac58;hp=8baac829ff08326e43376cee8ff6dcd9a693d891;hpb=fcf84b265c8aacae35942be0f2f7dba8e85ebb53;p=odoo%2Fodoo.git

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 8baac82..506c1e4 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -189,8 +189,39 @@ def init_logger():
     handler.setFormatter(formatter)
 
     # Configure handlers
+    default_config = [
+        'openerp.netsvc.rpc.request:INFO',
+        'openerp.netsvc.rpc.response:INFO',
+        'openerp.addons.web.common.http:INFO',
+        'openerp.addons.web.common.openerplib:INFO',
+        'openerp.sql_db:INFO',
+        ':INFO',
+    ]
+
+    if tools.config['log_level'] == 'info':
+        pseudo_config = []
+    elif tools.config['log_level'] == 'debug_rpc':
+        pseudo_config = ['openerp:DEBUG','openerp.netsvc.rpc.request:DEBUG']
+    elif tools.config['log_level'] == 'debug_rpc_answer':
+        pseudo_config = ['openerp:DEBUG','openerp.netsvc.rpc.request:DEBUG', 'openerp.netsvc.rpc.response:DEBUG']
+    elif tools.config['log_level'] == 'debug':
+        pseudo_config = ['openerp:DEBUG']
+    elif tools.config['log_level'] == 'test':
+        pseudo_config = ['openerp:TEST']
+    elif tools.config['log_level'] == 'warn':
+        pseudo_config = ['openerp:WARNING']
+    elif tools.config['log_level'] == 'error':
+        pseudo_config = ['openerp:ERROR']
+    elif tools.config['log_level'] == 'critical':
+        pseudo_config = ['openerp:CRITICAL']
+    elif tools.config['log_level'] == 'debug_sql':
+        pseudo_config = ['openerp.sql_db:DEBUG']
+    else:
+        pseudo_config = []
+
     logconfig = tools.config['log_handler']
-    for logconfig_item in logconfig:
+
+    for logconfig_item in default_config + pseudo_config + logconfig:
         loggername, level = logconfig_item.split(':')
         level = getattr(logging, level, logging.INFO)
         logger = logging.getLogger(loggername)
@@ -200,9 +231,8 @@ def init_logger():
         if loggername != '':
             logger.propagate = False
 
-    for logconfig_item in logconfig:
-        _logger.debug('logger level set: "%s"'%logconfig_item)
-
+    for logconfig_item in default_config + pseudo_config + logconfig:
+        _logger.debug('logger level set: "%s"', logconfig_item)
 
 # A alternative logging scheme for automated runs of the
 # server intended to test it.
@@ -318,25 +348,25 @@ def dispatch_rpc(service_name, method, params):
     NET-RPC) is done in a upper layer.
     """
     try:
-        rpc_terse = logging.getLogger(__name__ + '.rpc.terse')
-        rpc_verbose = logging.getLogger(__name__ + '.rpc.verbose')
-        rpc_terse_flag = rpc_terse.isEnabledFor(logging.DEBUG)
-        rpc_verbose_flag = rpc_verbose.isEnabledFor(logging.DEBUG)
-        if rpc_terse_flag or rpc_verbose_flag:
+        rpc_request = logging.getLogger(__name__ + '.rpc.request')
+        rpc_response = logging.getLogger(__name__ + '.rpc.response')
+        rpc_request_flag = rpc_request.isEnabledFor(logging.DEBUG)
+        rpc_response_flag = rpc_response.isEnabledFor(logging.DEBUG)
+        if rpc_request_flag or rpc_response_flag:
             start_time = time.time()
-            if rpc_terse_flag:
-                log(rpc_terse,logging.DEBUG,'%s.%s:<-- '%(service_name,method), replace_request_password(params), depth=1)
-            else:
-                log(rpc_verbose,logging.DEBUG,'%s.%s:<-- '%(service_name,method), replace_request_password(params))
+            if rpc_request and rpc_response_flag:
+                log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params))
 
+        threading.current_thread().uid = None
+        threading.current_thread().dbname = None
         result = ExportService.getService(service_name).dispatch(method, params)
 
-        if rpc_terse_flag or rpc_verbose_flag:
+        if rpc_request_flag or rpc_response_flag:
             end_time = time.time()
-            if rpc_terse_flag:
-                log(rpc_terse,logging.DEBUG,'%s.%s:--> (time: %.3fs) '%(service_name,method,end_time - start_time), result, depth=1)
+            if rpc_response_flag:
+                log(rpc_response,logging.DEBUG,'%s.%s time:%.3fs '%(service_name,method,end_time - start_time), result)
             else:
-                log(rpc_verbose,logging.DEBUG,'%s.%s:--> (time: %.3fs) '%(service_name,method,end_time - start_time), result)
+                log(rpc_request,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: