From b07d4050e29a0576ebfa032d10b8b42007919157 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 6 Oct 2010 10:10:52 +0200 Subject: [PATCH] xmlrpc calls traced with logger.debug use /var/log/sfa.log for servers and stderr for clients --- sfa/client/sfi.py | 2 ++ sfa/util/xmlrpcprotocol.py | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 52f0b671..f7eecb3d 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -313,6 +313,8 @@ class Sfi: self.key_file = key_file self.cert_file = cert_file self.cert = Certificate(filename=cert_file) + # instruct xmlrpcprotocol to redirect logs to console_logger + self.options.client=True # Establish connection to server(s) self.logger.info("Contacting Registry at: %s"%reg_url) self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options) diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py index afba6f3b..d1fbe1e4 100644 --- a/sfa/util/xmlrpcprotocol.py +++ b/sfa/util/xmlrpcprotocol.py @@ -2,6 +2,8 @@ import xmlrpclib +from sfa.util.sfalogging import sfa_logger, console_logger + ## # ServerException, ExceptionUnmarshaller # @@ -51,11 +53,14 @@ class XMLRPCServerProxy(xmlrpclib.ServerProxy): verbose = False if self.options and self.options.debug: verbose = True + if self.options and hasattr(self.options,'client'): + XMLRPCServerProxy.logger=console_logger + else: + XMLRPCServerProxy.logger=sfa_logger xmlrpclib.ServerProxy.__init__(self, url, transport, allow_none=allow_none, verbose=verbose) def __getattr__(self, attr): - if self.options and self.options.verbose: - print "Calling xml-rpc method:", attr + XMLRPCServerProxy.logger.debug("Calling xml-rpc method:%s"%attr) return xmlrpclib.ServerProxy.__getattr__(self, attr) -- 2.45.2