Some changes to make reading dubugging output easier

This commit is contained in:
Jason Gerard DeRose 2008-11-24 10:09:30 -07:00
parent c02770129d
commit 2db738e899
3 changed files with 12 additions and 3 deletions

View File

@ -539,6 +539,7 @@ class Command(plugable.Plugin):
If not in a server context, the call will be forwarded over
XML-RPC and the executed an the nearest IPA server.
"""
self.debug(make_repr(self.name, *args, **kw))
if len(args) > 0:
arg_kw = self.args_to_kw(*args)
assert set(arg_kw).intersection(kw) == set()
@ -548,7 +549,9 @@ class Command(plugable.Plugin):
kw.update(self.get_default(**kw))
self.validate(**kw)
(args, options) = self.params_2_args_options(kw)
return self.run(*args, **options)
result = self.run(*args, **options)
self.debug('%s result: %r', self.name, result)
return result
def args_to_kw(self, *values):
"""

View File

@ -253,6 +253,11 @@ class Plugin(ReadOnly):
__proxy__ = True
__api = None
def __init__(self):
log = logging.getLogger('ipa')
for name in ('debug', 'info', 'warning', 'error', 'critical'):
setattr(self, name, getattr(log, name))
def __get_name(self):
"""
Convenience property to return the class name.

View File

@ -51,14 +51,15 @@ class xmlrpc(Backend):
if uri.startswith('https://'):
return xmlrpclib.ServerProxy(uri,
transport=KerbTransport(),
verbose=self.api.env.verbose,
#verbose=self.api.env.verbose,
)
return xmlrpclib.ServerProxy(uri, verbose=self.api.env.verbose)
return xmlrpclib.ServerProxy(uri)
def forward_call(self, name, *args, **kw):
"""
Forward a call over XML-RPC to an IPA server.
"""
self.info('Forwarding %r call to %r' % (name, self.env.xmlrpc_uri))
client = self.get_client()
command = getattr(client, name)
params = xmlrpc_marshal(*args, **kw)