mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Fix exception handling when xmlrpclib.Fault is raised, in legacy mode.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
This commit is contained in:
Ewan Mellor committed
1 parent
f5f96d3c4f
commit
b5d7ad3a95
1 file changed
+6
-3
@@ -241,10 +241,13 @@ class TCPXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer):
|
||||
"ErrorDescription": errdesc },),
|
||||
methodresponse = 1)
|
||||
else:
|
||||
log.exception('Internal error handling %s', method)
|
||||
import xen.xend.XendClient
|
||||
response = xmlrpclib.dumps(
|
||||
xmlrpclib.Fault(xen.xend.XendClient.ERROR_INTERNAL, str(exn)))
|
||||
if isinstance(exn, xmlrpclib.Fault):
|
||||
response = xmlrpclib.dumps(exn)
|
||||
else:
|
||||
log.exception('Internal error handling %s', method)
|
||||
response = xmlrpclib.dumps(
|
||||
xmlrpclib.Fault(xen.xend.XendClient.ERROR_INTERNAL, str(exn)))
|
||||
except:
|
||||
log.exception('Internal error handling error')
|
||||
|
||||
|
||||