refactoring

2 files changed, 18 insertions, 12 deletions

diff --git a/kvmd/apps/kvmd/server.py b/kvmd/apps/kvmd/server.py
index 815191bd..f3dc222b 100644
--- a/kvmd/apps/kvmd/server.py
+++ b/kvmd/apps/kvmd/server.py
@@ -36,7 +36,6 @@ from typing import AsyncGenerator
 from typing import Optional
 from typing import Any
 
-from aiohttp.web import Application
 from aiohttp.web import Request
 from aiohttp.web import Response
 from aiohttp.web import WebSocketResponse
@@ -297,7 +296,7 @@ class KvmdServer(HttpServer):  # pylint: disable=too-many-arguments,too-many-ins
     async def _check_request_auth(self, exposed: HttpExposed, request: Request) -> None:
         await check_request_auth(self.__auth_manager, exposed, request)
 
-    async def _init_app(self, _: Application) -> None:
+    async def _init_app(self) -> None:
         self.__run_system_task(self.__stream_controller)
         for comp in self.__components:
             if comp.systask:
@@ -325,7 +324,7 @@ class KvmdServer(HttpServer):  # pylint: disable=too-many-arguments,too-many-ins
                 os.kill(os.getpid(), signal.SIGTERM)
         self.__system_tasks.append(asyncio.create_task(wrapper()))
 
-    async def _on_shutdown(self, _: Application) -> None:
+    async def _on_shutdown(self) -> None:
         logger = get_logger(0)
 
         logger.info("Waiting short tasks ...")
@@ -344,7 +343,7 @@ class KvmdServer(HttpServer):  # pylint: disable=too-many-arguments,too-many-ins
 
         logger.info("On-Shutdown complete")
 
-    async def _on_cleanup(self, _: Application) -> None:
+    async def _on_cleanup(self) -> None:
         logger = get_logger(0)
         for comp in self.__components:
             if comp.cleanup:
diff --git a/kvmd/htserver.py b/kvmd/htserver.py
index 1d86ba16..c24837d2 100644
--- a/kvmd/htserver.py
+++ b/kvmd/htserver.py
@@ -325,14 +325,14 @@ class HttpServer:
     async def _check_request_auth(self, exposed: HttpExposed, request: Request) -> None:
         pass
 
-    async def _init_app(self, app: Application) -> None:
+    async def _init_app(self) -> None:
         raise NotImplementedError
 
-    async def _on_shutdown(self, app: Application) -> None:
-        _ = app
+    async def _on_shutdown(self) -> None:
+        pass
 
-    async def _on_cleanup(self, app: Application) -> None:
-        _ = app
+    async def _on_cleanup(self) -> None:
+        pass
 
     # =====
 
@@ -342,9 +342,16 @@ class HttpServer:
             remove_slash=True,
             merge_slashes=True,
         )])
-        self.__app.on_shutdown.append(self._on_shutdown)
-        self.__app.on_cleanup.append(self._on_cleanup)
-        await self._init_app(self.__app)
+
+        async def on_shutdown(_: Application) -> None:
+            await self._on_shutdown()
+        self.__app.on_shutdown.append(on_shutdown)
+
+        async def on_cleanup(_: Application) -> None:
+            await self._on_cleanup()
+        self.__app.on_cleanup.append(on_cleanup)
+
+        await self._init_app()
         return self.__app
 
     def __run_app_print(self, text: str) -> None: