From 7f1ead5a542f0c873cc0cb6960b7ff8c57bda777 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@cobalt>
Date: Thu, 18 Dec 2008 11:10:43 +0100
Subject: [PATCH] [IMP] add a new log-level to allow debug netrpc messages
 [IMP] change the log level to CRITICAL when then address can not be bind.

bzr revid: christophe@cobalt-20081218101043-aornsyiulhm0teue
---
 bin/netsvc.py       | 20 +++++++++++++++++++-
 bin/tools/config.py |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index fca2ece17c0..7496a9703c0 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -144,12 +144,16 @@ def service_exist(name):
 def get_rpc_paths():
     return map(lambda s: '/xmlrpc/%s' % s, _service)
 
+
+LOG_DEBUG_RPC = 'debug_rpc'
 LOG_DEBUG = 'debug'
 LOG_INFO = 'info'
 LOG_WARNING = 'warn'
 LOG_ERROR = 'error'
 LOG_CRITICAL = 'critical'
 
+# add new log level below DEBUG
+logging.DEBUG_RPC = logging.DEBUG - 1
 
 def init_logger():
     from tools import config
@@ -178,6 +182,7 @@ def init_logger():
     logging.getLogger().addHandler(handler)
     logging.getLogger().setLevel(config['log_level'])
 
+    
     if isinstance(handler, logging.StreamHandler) and os.name != 'nt':
         # change color of level names
         # uses of ANSI color codes
@@ -188,6 +193,7 @@ def init_logger():
         background = lambda f: 40 + colors.index(f)
 
         mapping = {
+            'DEBUG_RPC': ('blue', 'white'),
             'DEBUG': ('blue', 'default'),
             'INFO': ('green', 'default'),
             'WARNING': ('yellow', 'default'),
@@ -203,6 +209,11 @@ def init_logger():
 class Logger(object):
     def notifyChannel(self, name, level, msg):
         log = logging.getLogger(name)
+
+        if level == LOG_DEBUG_RPC and not hasattr(log, level):
+            fct = lambda msg, *args, **kwargs: log.log(logging.DEBUG_RPC, msg, *args, **kwargs)
+            setattr(log, LOG_DEBUG_RPC, fct)
+
         level_method = getattr(log, level)
 
         result = str(msg).strip().split('\n')
@@ -297,7 +308,7 @@ class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer
             self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             SimpleXMLRPCServer.SimpleXMLRPCServer.server_bind(self)
         except:
-            Logger().notifyChannel('init', LOG_ERROR, 'Address already in use')
+            Logger().notifyChannel('init', LOG_CRITICAL, 'Address already in use')
             sys.exit(1)
 
 class HttpDaemon(threading.Thread):
@@ -368,6 +379,10 @@ class TinySocketClientThread(threading.Thread):
         threading.Thread.__init__(self)
         self.sock = sock
         self.threads = threads
+        self._logger = Logger()
+
+    def log(self, msg):
+        self._logger.notifyChannel('NETRPC', LOG_DEBUG_RPC, msg)
 
     def run(self):
         import traceback
@@ -388,6 +403,7 @@ class TinySocketClientThread(threading.Thread):
                 self.threads.remove(self)
                 return False
             try:
+                self.log(msg)
                 s = LocalService(msg[0])
                 m = getattr(s, msg[1])
                 s._service._response = None
@@ -395,6 +411,7 @@ class TinySocketClientThread(threading.Thread):
                 res = s._service._response
                 if res != None:
                     r = res
+                self.log(r)
                 ts.mysend(r)
             except Exception, e:
                 tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
@@ -404,6 +421,7 @@ class TinySocketClientThread(threading.Thread):
                     tb = sys.exc_info()[2]
                     pdb.post_mortem(tb)
                 e = Exception(str(e))
+                self.log(str(e))
                 ts.mysend(e, exception=True, traceback=tb_s)
             except:
                 pass
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 1d5a3372537..e93bf7aec37 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -70,7 +70,7 @@ class configmanager(object):
             'assert_exit_level': logging.WARNING, # level above which a failed assert will be raise
         }
         
-        loglevels = dict([(getattr(netsvc, 'LOG_%s' % x), getattr(logging, x)) for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG')]) 
+        loglevels = dict([(getattr(netsvc, 'LOG_%s' % x), getattr(logging, x)) for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'DEBUG_RPC')]) 
 
         version = "%s %s" % (release.description, release.version)
         parser = optparse.OptionParser(version=version)