Handle non-waiter condition on close better

asyncamqp/channel.py

@@ -128,7 +128,7 @@ def _set_waiter(self, rpc_name):
     def _get_waiter(self, rpc_name):
         fut = self._futures.pop(rpc_name, None)
         if not fut:
-            raise exceptions.SynchronizationError("Call %s didn't set a waiter" % rpc_name)
+            raise exceptions.SynchronizationError("Call %r didn't set a waiter" % rpc_name)
         return fut
 
     @property
@@ -291,7 +291,12 @@ async def close(self, reply_code=0, reply_text="Normal Shutdown"):
             )
 
     async def close_ok(self, frame):
-        await self._get_waiter('close').set_result(True)
+        try:
+            w = self._get_waiter('close')
+        except asyncamqp.exceptions.SynchronizationError:
+            pass
+        else:
+            await w.set_result(True)
         logger.info("Channel closed")
         self.protocol.release_channel_id(self.channel_id)
 

asyncamqp/protocol.py

@@ -518,10 +518,14 @@ async def _reader_loop(self, done):
                             # going for now (need to process the close-OK
                             # message). Thus we start a new task that
                             # raises the actual error, somewhat later.
+                            if self._nursery is None:
+                                raise
+
                             async def owch(exc):
-                                await anyio.sleep(0)
+                                await anyio.sleep(0.01)
                                 raise exc
 
+                            logger.error("Queue",repr(exc))
                             await self._nursery.spawn(owch, exc)
 
                     except TimeoutError: