RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aiorpcX 0.7.0 has better string text for TaskTimeout

Browse Source
This commit is contained in:
Neil Booth 2018-08-08 12:07:36 +09:00
parent 6697614427
commit 2d66a4f5aa
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electrumx/server/peers.py
View File

@ -231,16 +231,14 @@ class PeerManager(object):
is_good = True is_good = True
break break
except BadPeerError as e: except BadPeerError as e:
self.logger.error(f'{peer_text} marking bad: ({e!r})') self.logger.error(f'{peer_text} marking bad: ({e})')
peer.mark_bad() peer.mark_bad()
break break
except RPCError as e: except RPCError as e:
self.logger.error(f'{peer_text} RPC error: {e.message} ' self.logger.error(f'{peer_text} RPC error: {e.message} '
f'({e.code})') f'({e.code})')
except TaskTimeout as e: except (OSError, SOCKSError, ConnectionError, TaskTimeout) as e:
self.logger.error(f'{peer_text} timed out after {e.args[0]}s') self.logger.info(f'{peer_text} {e}')
except (OSError, SOCKSError, ConnectionError) as e:
self.logger.info(f'{peer_text} {e!r}')
if is_good: if is_good:
now = time.time() now = time.time()

2
electrumx_rpc
View File

@ -128,8 +128,6 @@ def main():
except OSError: except OSError:
print('cannot connect - is ElectrumX catching up, not running, or ' print('cannot connect - is ElectrumX catching up, not running, or '
f'is {port} the wrong RPC port?') f'is {port} the wrong RPC port?')
except TaskTimeout as e:
print(f'request timed out after {e.args[0]}s')
except Exception as e: except Exception as e:
print(f'error making request: {e!r}') print(f'error making request: {e!r}')