uniform service task cancellation

miguelgrinberg · Feb 11, 2019 · 82f6982 · 82f6982
1 parent c60499e
commit 82f6982
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/engineio/asyncio_server.py b/engineio/asyncio_server.py
@@ -415,8 +415,8 @@ async def _service_task(self):  # pragma: no cover
                     if not socket.closing and not socket.closed:
                         await socket.check_ping_timeout()
                     await self.sleep(sleep_interval)
-            except (KeyboardInterrupt, asyncio.CancelledError):
-                self.logger.debug('service task cancelled')
+            except (SystemExit, KeyboardInterrupt, asyncio.CancelledError):
+                self.logger.info('service task canceled')
                 break
             except:
                 # an unexpected exception has occurred, log it and continue

diff --git a/engineio/server.py b/engineio/server.py
@@ -610,6 +610,7 @@ def _service_task(self):  # pragma: no cover
                         s.check_ping_timeout()
                     self.sleep(sleep_interval)
             except (SystemExit, KeyboardInterrupt):
+                self.logger.info('service task canceled')
                 break
             except:
                 # an unexpected exception has occurred, log it and continue