Merge pull request #337 from pipermerriam/piper/log-error-instead-of-…

…crash-when-deadlocked

Log error instead of crash during deadlock

ddht/v5_1/network.py

@@ -241,14 +241,17 @@ async def _monitor_done(send_channel: trio.abc.SendChannel[ENRAPI]) -> None:
                 while True:
                     # this `fail_after` is a failsafe to prevent deadlock situations
                     # which are possible with `Condition` objects.
-                    with trio.fail_after(60):
+                    with trio.move_on_after(60) as scope:
                         node_ids = get_unqueried_node_ids()
 
                         if not node_ids and not in_flight:
                             break
                         else:
                             await condition.wait()
 
+                    if scope.cancelled_caught:
+                        network.logger.error("Deadlock")
+
     send_channel, receive_channel = trio.open_memory_channel[ENRAPI](256)
 
     async with trio.open_nursery() as nursery: