Merge pull request #122 from AndrewFerr/safe-stop-during-startup

Don't crash when stopping process during startup

Author: tulir

mautrix/appservice/appservice.py

@@ -36,8 +36,8 @@ class AppService(AppServiceServerMixin):
     domain: str
     id: str
     verify_ssl: bool
-    tls_cert: str
-    tls_key: str
+    tls_cert: str | None
+    tls_key: str | None
     as_token: str
     hs_token: str
     bot_mxid: UserID
@@ -56,7 +56,10 @@ class AppService(AppServiceServerMixin):
     loop: asyncio.AbstractEventLoop
     log: TraceLogger
     app: web.Application
-    runner: web.AppRunner
+    runner: web.AppRunner | None
+
+    _http_session: aiohttp.ClientSession | None
+    _intent: IntentAPI | None
 
     def __init__(
         self,
@@ -178,10 +181,12 @@ async def start(self, host: str = "127.0.0.1", port: int = 8080) -> None:
 
     async def stop(self) -> None:
         self.log.debug("Stopping appservice web server")
-        await self.runner.cleanup()
+        if self.runner:
+            await self.runner.cleanup()
         self._intent = None
-        await self._http_session.close()
-        self._http_session = None
+        if self._http_session:
+            await self._http_session.close()
+            self._http_session = None
         await self.state_store.close()
 
     async def _liveness_probe(self, _: web.Request) -> web.Response: