Merge pull request #1824 from lbryio/fix-ping-timeout

fix timeout error

lbrynet/dht/protocol/async_generator_junction.py

@@ -100,6 +100,6 @@ class AsyncGeneratorJunction:
             pass
         finally:
             if exc_type:
-                if exc_type not in (asyncio.CancelledError, asyncio.TimeoutError, StopAsyncIteration):
+                if exc_type not in (asyncio.CancelledError, asyncio.TimeoutError, StopAsyncIteration, GeneratorExit):
                     err = traceback.format_exception(exc_type, exc, tb)
                     log.error(err)

lbrynet/dht/protocol/protocol.py

@@ -218,7 +218,7 @@ class PingQueue:
                     await self._protocol.add_peer(p)
                     return
                 await self._protocol.get_rpc_peer(p).ping()
-            except TimeoutError:
+            except asyncio.TimeoutError:
                 pass
 
         while True:

lbrynet/extras/daemon/Daemon.py

@@ -2815,7 +2815,7 @@ class Daemon(metaclass=JSONRPCServerType):
         try:
             result = await peer.ping()
             return result.decode()
-        except TimeoutError:
+        except asyncio.TimeoutError:
             return {'error': 'ping timeout'}
 
     @requires(DHT_COMPONENT)