[FIX] website_forum: post edition working again
[odoo/odoo.git] / openerp / netsvc.py
index 250cd52..755f651 100644 (file)
@@ -26,10 +26,13 @@ import os
 import release
 import sys
 import threading
+import time
+import types
+from pprint import pformat
+import psutil
 
 import tools
 import openerp
-import openerp.loggers
 
 _logger = logging.getLogger(__name__)
 
@@ -86,19 +89,6 @@ class ColoredFormatter(DBFormatter):
         record.levelname = COLOR_PATTERN % (30 + fg_color, 40 + bg_color, record.levelname)
         return DBFormatter.format(self, record)
 
-import platform
-def is_posix_operating_system():
-    return os.name == 'posix'
-
-def is_windows_operating_system():
-    return os.name == 'nt'
-
-def is_linux_operating_system():
-    return is_posix_operating_system() and platform.system() == 'Linux'
-
-def is_macosx_operating_system():
-    return is_posix_operating_system() and platform.system() == 'Darwin'
-
 def init_logger():
     from tools.translate import resetlocale
     resetlocale()
@@ -108,32 +98,24 @@ def init_logger():
 
     if tools.config['syslog']:
         # SysLog Handler
-        if is_windows_operating_system():
+        if os.name == 'nt':
             handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version))
-        elif is_linux_operating_system():
-            handler = logging.handlers.SysLogHandler('/dev/log')
-        elif is_macosx_operating_system():  # There is no /dev/log on OSX
-            handler = logging.handlers.SysLogHandler('/var/run/log')
         else:
-            raise Exception("There is no syslog handler for this Operating System: %s", platform.system())
-
-        format = '%s %s' % (release.description, release.version) + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
+            handler = logging.handlers.SysLogHandler('/dev/log')
+        format = '%s %s' % (release.description, release.version) \
+                + ':%(dbname)s:%(levelname)s:%(name)s:%(message)s'
 
     elif tools.config['logfile']:
         # LogFile Handler
         logf = tools.config['logfile']
         try:
-            # We check we have the right location for the log files
             dirname = os.path.dirname(logf)
             if dirname and not os.path.isdir(dirname):
                 os.makedirs(dirname)
-
             if tools.config['logrotate'] is not False:
-                handler = logging.handlers.TimedRotatingFileHandler(filename=logf, when='D', interval=1, backupCount=30)
-
-            elif is_posix_operating_system():
+                handler = logging.handlers.TimedRotatingFileHandler(logf,'D',1,30)
+            elif os.name == 'posix':
                 handler = logging.handlers.WatchedFileHandler(logf)
-
             else:
                 handler = logging.handlers.FileHandler(logf)
         except Exception:
@@ -147,14 +129,12 @@ def init_logger():
     # behind Apache with mod_wsgi, handler.stream will have type mod_wsgi.Log,
     # which has no fileno() method. (mod_wsgi.Log is what is being bound to
     # sys.stderr when the logging.StreamHandler is being constructed above.)
-    def has_fileno(stream):
-        return hasattr(stream, 'fileno') and os.isatty(stream.fileno())
-
-    if isinstance(handler, logging.StreamHandler) and has_fileno(handler.stream):
+    if isinstance(handler, logging.StreamHandler) \
+        and hasattr(handler.stream, 'fileno') \
+        and os.isatty(handler.stream.fileno()):
         formatter = ColoredFormatter(format)
     else:
         formatter = DBFormatter(format)
-
     handler.setFormatter(formatter)
 
     # Configure handlers
@@ -165,9 +145,7 @@ def init_logger():
     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)
         logger.handlers = []
         logger.setLevel(level)
@@ -175,13 +153,6 @@ def init_logger():
         if loggername != '':
             logger.propagate = False
 
-    # magic ;-)
-    # we manage the connection in the postgresqlhandler
-    postgresqlHandler = openerp.loggers.handlers.PostgreSQLHandler()
-    postgresqlHandler.setLevel(logging.WARNING)
-    logger = logging.getLogger()
-    logger.addHandler(postgresqlHandler)
-
     for logconfig_item in logging_configurations:
         _logger.debug('logger level set: "%s"', logconfig_item)
 
@@ -217,4 +188,86 @@ def init_alternative_logger():
     logger.addHandler(handler)
     logger.setLevel(logging.ERROR)
 
+def replace_request_password(args):
+    # password is always 3rd argument in a request, we replace it in RPC logs
+    # so it's easier to forward logs for diagnostics/debugging purposes...
+    if len(args) > 2:
+        args = list(args)
+        args[2] = '*'
+    return tuple(args)
+
+def log(logger, level, prefix, msg, depth=None):
+    indent=''
+    indent_after=' '*len(prefix)
+    for line in (prefix+pformat(msg, depth=depth)).split('\n'):
+        logger.log(level, indent+line)
+        indent=indent_after
+
+def dispatch_rpc(service_name, method, params):
+    """ Handle a RPC call.
+
+    This is pure Python code, the actual marshalling (from/to XML-RPC) is done
+    in a upper layer.
+    """
+    try:
+        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()
+            start_rss, start_vms = 0, 0
+            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))
+
+        threading.current_thread().uid = None
+        threading.current_thread().dbname = None
+        if service_name == 'common':
+            dispatch = openerp.service.common.dispatch
+        elif service_name == 'db':
+            dispatch = openerp.service.db.dispatch
+        elif service_name == 'object':
+            dispatch = openerp.service.model.dispatch
+        elif service_name == 'report':
+            dispatch = openerp.service.report.dispatch
+        else:
+            dispatch = openerp.service.wsgi_server.rpc_handlers.get(service_name)
+        result = dispatch(method, params)
+
+        if rpc_request_flag or rpc_response_flag:
+            end_time = time.time()
+            end_rss, end_vms = 0, 0
+            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)
+            else:
+                log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1)
+
+        return result
+    except openerp.osv.orm.except_orm:
+        raise
+    except openerp.exceptions.AccessError:
+        raise
+    except openerp.exceptions.AccessDenied:
+        raise
+    except openerp.exceptions.Warning:
+        raise
+    except openerp.exceptions.RedirectWarning:
+        raise
+    except openerp.exceptions.DeferredException, e:
+        _logger.exception(tools.exception_to_unicode(e))
+        post_mortem(e.traceback)
+        raise
+    except Exception, e:
+        _logger.exception(tools.exception_to_unicode(e))
+        post_mortem(sys.exc_info())
+        raise
+
+def post_mortem(info):
+    if tools.config['debug_mode'] and isinstance(info[2], types.TracebackType):
+        import pdb
+        pdb.post_mortem(info[2])
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: