Catch ProtocolError on second EPIPE call in jsonrpc

The pipe could be broken and the request may raise an error like 401
UNAUTHORIZE. So this error must be catch also for the second call.

issue7521
review52391002
This commit is contained in:
Cédric Krier committed 2018-06-25 22:53:47 +02:00
1 parent b7a55b2cf3
commit 4885b75e41
1 file changed
+19 -18
+19 -18
View File
@@ -265,24 +265,25 @@ class ServerProxy(xmlrpclib.ServerProxy):
}, cls=JSONEncoder, separators=(',', ':'))
try:
response = self.__transport.request(
self.__host,
self.__handler,
request,
verbose=self.__verbose
)
except (socket.error, httplib.HTTPException), v:
if (isinstance(v, socket.error)
and v.args[0] == errno.EPIPE):
raise
# try one more time
self.__transport.close()
response = self.__transport.request(
self.__host,
self.__handler,
request,
verbose=self.__verbose
)
try:
response = self.__transport.request(
self.__host,
self.__handler,
request,
verbose=self.__verbose
)
except (socket.error, httplib.HTTPException), v:
if (isinstance(v, socket.error)
and v.args[0] == errno.EPIPE):
raise
# try one more time
self.__transport.close()
response = self.__transport.request(
self.__host,
self.__handler,
request,
verbose=self.__verbose
)
except xmlrpclib.ProtocolError, e:
raise Fault(str(e.errcode), e.errmsg)
except: