address potential lock of the service thread

miguelgrinberg · Oct 9, 2018 · b702f6f · b702f6f
1 parent 2f5cd48
commit b702f6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/engineio/asyncio_server.py b/engineio/asyncio_server.py
@@ -315,9 +315,8 @@ async def _service_task(self):  # pragma: no cover
             try:
                 # iterate over the current clients
                 for socket in self.sockets.copy().values():
-                    if socket.closed:
-                        continue
-                    await socket.check_ping_timeout()
+                    if not socket.closing and not socket.closed:
+                        await socket.check_ping_timeout()
                     await self.sleep(sleep_interval)
             except:
                 # an unexpected exception has occurred, log it and continue

diff --git a/engineio/server.py b/engineio/server.py
@@ -524,9 +524,8 @@ def _service_task(self):  # pragma: no cover
             try:
                 # iterate over the current clients
                 for s in self.sockets.copy().values():
-                    if s.closed:
-                        continue
-                    s.check_ping_timeout()
+                    if not s.closing and not s.closed:
+                        s.check_ping_timeout()
                     self.sleep(sleep_interval)
             except (SystemExit, KeyboardInterrupt):
                 break