AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: hide some server-induced errors from log

Browse Source
This commit is contained in:
SomberNight
2019-05-28 21:23:06 +02:00
parent d17e6a1b87
commit ab81a09de2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/interface.py
View File

@@ -328,6 +328,9 @@ class Interface(Logger):
return await func(self, *args, **kwargs) return await func(self, *args, **kwargs)
except GracefulDisconnect as e: except GracefulDisconnect as e:
self.logger.log(e.log_level, f"disconnecting due to {repr(e)}") self.logger.log(e.log_level, f"disconnecting due to {repr(e)}")
except aiorpcx.jsonrpc.RPCError as e:
self.logger.warning(f"disconnecting due to {repr(e)}")
self.logger.debug(f"(disconnect) trace for {repr(e)}", exc_info=True)
finally: finally:
await self.network.connection_down(self) await self.network.connection_down(self)
self.got_disconnected.set_result(1) self.got_disconnected.set_result(1)
@@ -454,8 +457,10 @@ class Interface(Logger):
await group.spawn(self.run_fetch_blocks) await group.spawn(self.run_fetch_blocks)
await group.spawn(self.monitor_connection) await group.spawn(self.monitor_connection)
except aiorpcx.jsonrpc.RPCError as e: except aiorpcx.jsonrpc.RPCError as e:
if e.code in (JSONRPC.EXCESSIVE_RESOURCE_USAGE, JSONRPC.SERVER_BUSY): if e.code in (JSONRPC.EXCESSIVE_RESOURCE_USAGE,
raise GracefulDisconnect(e, log_level=logging.ERROR) from e JSONRPC.SERVER_BUSY,
JSONRPC.METHOD_NOT_FOUND):
raise GracefulDisconnect(e, log_level=logging.WARNING) from e
raise raise
async def monitor_connection(self): async def monitor_connection(self):