[REF] Refactoring according to the review of CHS

[odoo/odoo.git] / openerp / netsvc.py

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index e833bcc..755f651 100644 (file)
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -21,37 +20,47 @@
 ##############################################################################
 
 
-import errno
 import logging
 import logging.handlers
 import os
-import platform
 import release
 import sys
 import threading
 import time
 import types
 from pprint import pformat
+import psutil
 
-try:
-    import psutil
-except ImportError:
-    psutil = None
-
-# TODO modules that import netsvc only for things from loglevels must be changed to use loglevels.
-from loglevels import *
 import tools
 import openerp
 
 _logger = logging.getLogger(__name__)
 
 def LocalService(name):
-    # Special case for addons support, will be removed in a few days when addons
-    # are updated to directly use openerp.osv.osv.service.
+    """
+    The openerp.netsvc.LocalService() function is deprecated. It still works
+    in two cases: workflows and reports. For workflows, instead of using
+    LocalService('workflow'), openerp.workflow should be used (better yet,
+    methods on openerp.osv.orm.Model should be used). For reports,
+    openerp.report.render_report() should be used (methods on the Model should
+    be provided too in the future).
+    """
+    assert openerp.conf.deprecation.allow_local_service
+    _logger.warning("LocalService() is deprecated since march 2013 (it was called with '%s')." % name)
+
     if name == 'workflow':
         return openerp.workflow
 
-    return openerp.report.interface.report_int._reports[name]
+    if name.startswith('report.'):
+        report = openerp.report.interface.report_int._reports.get(name)
+        if report:
+            return report
+        else:
+            dbname = getattr(threading.currentThread(), 'dbname', None)
+            if dbname:
+                registry = openerp.modules.registry.RegistryManager.get(dbname)
+                with registry.cursor() as cr:
+                    return registry['ir.actions.report.xml']._lookup_report(cr, name[len('report.'):])
 
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, _NOTHING, DEFAULT = range(10)
 #The background is set with 40 plus the number of the color, and the foreground with 30
@@ -63,7 +72,6 @@ COLOR_PATTERN = "%s%s%%s%s" % (COLOR_SEQ, COLOR_SEQ, RESET_SEQ)
 LEVEL_COLOR_MAPPING = {
     logging.DEBUG: (BLUE, DEFAULT),
     logging.INFO: (GREEN, DEFAULT),
-    logging.TEST: (WHITE, BLUE),
     logging.WARNING: (YELLOW, DEFAULT),
     logging.ERROR: (RED, DEFAULT),
     logging.CRITICAL: (WHITE, RED),
@@ -134,7 +142,8 @@ def init_logger():
 
     logconfig = tools.config['log_handler']
 
-    for logconfig_item in DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig:
+    logging_configurations = DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig
+    for logconfig_item in logging_configurations:
         loggername, level = logconfig_item.split(':')
         level = getattr(logging, level, logging.INFO)
         logger = logging.getLogger(loggername)
@@ -144,7 +153,7 @@ def init_logger():
         if loggername != '':
             logger.propagate = False
 
-    for logconfig_item in DEFAULT_LOG_CONFIGURATION + pseudo_config + logconfig:
+    for logconfig_item in logging_configurations:
         _logger.debug('logger level set: "%s"', logconfig_item)
 
 DEFAULT_LOG_CONFIGURATION = [
@@ -160,7 +169,6 @@ PSEUDOCONFIG_MAPPER = {
     'debug_rpc': ['openerp:DEBUG','openerp.netsvc.rpc.request:DEBUG'],
     'debug': ['openerp:DEBUG'],
     'debug_sql': ['openerp.sql_db:DEBUG'],
-    'test': ['openerp:TEST'],
     'info': [],
     'warn': ['openerp:WARNING'],
     'error': ['openerp:ERROR'],
@@ -209,8 +217,7 @@ def dispatch_rpc(service_name, method, params):
         if rpc_request_flag or rpc_response_flag:
             start_time = time.time()
             start_rss, start_vms = 0, 0
-            if psutil:
-                start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
+            start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
             if rpc_request and rpc_response_flag:
                 log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params))
 
@@ -231,8 +238,7 @@ def dispatch_rpc(service_name, method, params):
         if rpc_request_flag or rpc_response_flag:
             end_time = time.time()
             end_rss, end_vms = 0, 0
-            if psutil:
-                end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
+            end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
             logline = '%s.%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (service_name, method, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
             if rpc_response_flag:
                 log(rpc_response,logging.DEBUG, logline, result)