diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2009-01-22 17:03:48 -0700 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-02-03 15:29:01 -0500 |
commit | 833088955c0e6c606bc8ea96a05ddf6c3a34bc6b (patch) | |
tree | e34931d760a5341befd59a9623bf8e256af4b284 /ipalib/rpc.py | |
parent | 24b6cb89d443384cb432f01265c45bc18d9cf2fc (diff) | |
download | freeipa-833088955c0e6c606bc8ea96a05ddf6c3a34bc6b.tar.gz freeipa-833088955c0e6c606bc8ea96a05ddf6c3a34bc6b.tar.xz freeipa-833088955c0e6c606bc8ea96a05ddf6c3a34bc6b.zip |
More xmlrpc tweaks: xmlserver.execute() now logs non-public exceptions; xmlclient.forward() now handles socket error; fixed some Python 2.4 problems in lite-xmlrpc2.py
Diffstat (limited to 'ipalib/rpc.py')
-rw-r--r-- | ipalib/rpc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py index aa800209..55f3ea95 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -32,10 +32,11 @@ Also see the `ipaserver.rpcserver` module. from types import NoneType import threading +import socket from xmlrpclib import Binary, Fault, dumps, loads, ServerProxy, SafeTransport import kerberos from ipalib.backend import Backend -from ipalib.errors2 import public_errors, PublicError, UnknownError +from ipalib.errors2 import public_errors, PublicError, UnknownError, NetworkError from ipalib.request import context @@ -265,3 +266,5 @@ class xmlclient(Backend): error=e.faultString, server=self.env.xmlrpc_uri, ) + except socket.error, e: + raise NetworkError(uri=self.env.xmlrpc_uri, error=e.args[1]) |