aiorpcX 0.7.0 has better string text for TaskTimeout

electrumx/server/peers.py

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

electrumx_rpc

@@ -128,8 +128,6 @@ def main():
         except OSError:
             print('cannot connect - is ElectrumX catching up, not running, or '
                   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:
             print(f'error making request: {e!r}')