More reliable transport double-closing

edgedb · Aug 6, 2021 · 337b779 · 337b779
1 parent d718839
commit 337b779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/edgedb/asyncio_con.py b/edgedb/asyncio_con.py
@@ -166,13 +166,6 @@ async def aclose(self):
             try:
                 self._protocol.terminate()
                 await self._protocol.wait_for_disconnect()
-
-                # With asyncio on CPython 3.10 or lower, a normal exit
-                # (connection closed by peer) cannot set the transport._closed
-                # properly, leading to false ResourceWarning. Let's fix that by
-                # closing the transport again.
-                if not self._transport.is_closing():
-                    self._transport.close()
             except (Exception, asyncio.CancelledError):
                 self.terminate()
                 raise

diff --git a/edgedb/protocol/asyncio_proto.pyx b/edgedb/protocol/asyncio_proto.pyx
@@ -112,6 +112,12 @@ cdef class AsyncIOProtocol(protocol.SansIOProtocol):
             self.msg_waiter.set_exception(ConnectionResetError())
             self.msg_waiter = None
 
+        # With asyncio sslproto on CPython 3.10 or lower, a normal exit
+        # (connection closed by peer) cannot set the transport._closed
+        # properly, leading to false ResourceWarning. Let's fix that by
+        # closing the transport again.
+        if not self.transport.is_closing():
+            self.transport.close()
         self.transport = None
 
     def pause_writing(self):