This commit is contained in:
Jack Robison 2019-08-22 14:35:22 -04:00 committed by Victor Shyba
parent 8657a35fd7
commit 5e8d169c50

View file

@ -54,14 +54,18 @@ class ClientSession(BaseClientSession):
return result return result
async def send_request(self, method, args=(), timeout=None): async def send_request(self, method, args=(), timeout=None):
log.info("send %s to %s:%i", method, *self.server)
timeout = timeout or self.timeout timeout = timeout or self.timeout
self.pending_amount += 1 self.pending_amount += 1
try: try:
if method == 'server.version': if method == 'server.version':
return await self.send_timed_server_version_request(args, timeout) reply = await self.send_timed_server_version_request(args, timeout)
return await asyncio.wait_for( else:
super().send_request(method, args), timeout=timeout reply = await asyncio.wait_for(
) super().send_request(method, args), timeout=timeout
)
log.info("got reply for %s from %s:%i", method, *self.server)
return reply
except RPCError as e: except RPCError as e:
log.warning("Wallet server (%s:%i) returned an error. Code: %s Message: %s", log.warning("Wallet server (%s:%i) returned an error. Code: %s Message: %s",
*self.server, *e.args) *self.server, *e.args)
@ -71,8 +75,10 @@ class ClientSession(BaseClientSession):
self.synchronous_close() self.synchronous_close()
raise asyncio.CancelledError(f"connection to {self.server[0]}:{self.server[1]} lost") raise asyncio.CancelledError(f"connection to {self.server[0]}:{self.server[1]} lost")
except asyncio.TimeoutError: except asyncio.TimeoutError:
log.info("timeout sending %s to %s:%i", method, *self.server)
raise raise
except asyncio.CancelledError: except asyncio.CancelledError:
log.info("cancelled sending %s to %s:%i", method, *self.server)
self.synchronous_close() self.synchronous_close()
raise raise
finally: finally: