From 439f514ea59b8304de941c4a9d5e7b87e1da334f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mose=20M=C3=BCller?= Date: Tue, 19 Dec 2023 12:57:43 +0100 Subject: [PATCH] fixes WebServer --- src/pydase/server/web_server/web_server.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pydase/server/web_server/web_server.py b/src/pydase/server/web_server/web_server.py index cae60b8..4b5aaaa 100644 --- a/src/pydase/server/web_server/web_server.py +++ b/src/pydase/server/web_server/web_server.py @@ -62,6 +62,9 @@ class WebServer: self.enable_cors = enable_cors self._loop: asyncio.AbstractEventLoop + async def serve(self) -> None: + self._loop = asyncio.get_running_loop() + self._setup_socketio() self._setup_fastapi_app() self.web_server = uvicorn.Server( uvicorn.Config(self.__fastapi_app, host=self.host, port=self.port) @@ -69,13 +72,6 @@ class WebServer: # overwrite uvicorn's signal handlers, otherwise it will bogart SIGINT and # SIGTERM, which makes it impossible to escape out of self.web_server.install_signal_handlers = lambda: None # type: ignore[method-assign] - - async def serve(self) -> Any: - """Starts the server. This method should be implemented as an asynchronous - method, which means that it should be able to run concurrently with other tasks. - """ - self._loop = asyncio.get_running_loop() - self._setup_socketio() await self.web_server.serve() def _setup_socketio(self) -> None: @@ -117,7 +113,7 @@ class WebServer: app.mount( "/", StaticFiles( - directory=Path(__file__).parent.parent / "frontend", + directory=Path(__file__).parent.parent.parent / "frontend", html=True, ), )