From 016ed6e998de25c3a2d5caf119b4489c281b3ba5 Mon Sep 17 00:00:00 2001 From: Sims <38142618+suchmememanyskill@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:15:49 +0200 Subject: Fix shutdown timeouts (#695) Co-authored-by: AAGaming --- backend/decky_loader/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'backend/decky_loader/main.py') diff --git a/backend/decky_loader/main.py b/backend/decky_loader/main.py index c268b387..983d3dca 100644 --- a/backend/decky_loader/main.py +++ b/backend/decky_loader/main.py @@ -101,6 +101,8 @@ class PluginManager: self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), 'static'))]) async def handle_crash(self): + if not self.reinject: + return new_time = time() if (new_time - self.last_webhelper_exit < 60): self.webhelper_crash_count += 1 @@ -118,9 +120,13 @@ class PluginManager: async def shutdown(self, _: Application): try: logger.info(f"Shutting down...") + logger.info("Disabling reload...") + await self.plugin_loader.disable_reload() + logger.info("Killing plugins...") await self.plugin_loader.shutdown_plugins() - await self.ws.disconnect() + logger.info("Disconnecting from WS...") self.reinject = False + await self.ws.disconnect() if self.js_ctx_tab: await self.js_ctx_tab.close_websocket() self.js_ctx_tab = None -- cgit v1.2.3