diff options
author | Devaev Maxim <[email protected]> | 2018-06-29 23:31:47 +0300 |
---|---|---|
committer | Devaev Maxim <[email protected]> | 2018-06-29 23:31:47 +0300 |
commit | 93e28c62e53b1af05520cbb2f9f88dfc60455217 (patch) | |
tree | e407c0cb0732c52d90a9cee213e956bbb6b39753 /kvmd | |
parent | 607e5a9877659563cd96618bdf4948ac28830a27 (diff) |
refactoring
Diffstat (limited to 'kvmd')
-rw-r--r-- | kvmd/kvmd/server.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kvmd/kvmd/server.py b/kvmd/kvmd/server.py index 6a4c6d6a..7d87a955 100644 --- a/kvmd/kvmd/server.py +++ b/kvmd/kvmd/server.py @@ -67,18 +67,13 @@ class Server: # pylint: disable=too-many-instance-attributes app.on_cleanup.append(self.__on_cleanup) self.__system_tasks.extend([ - self.__loop.create_task(self.__monitor_keyboard()), + self.__loop.create_task(self.__keyboard_watchdog()), self.__loop.create_task(self.__stream_controller()), self.__loop.create_task(self.__poll_dead_sockets()), self.__loop.create_task(self.__poll_atx_leds()), ]) - aiohttp.web.run_app( - app=app, - host=host, - port=port, - print=(lambda text: [get_logger().info(line.strip()) for line in text.strip().splitlines()]), # type: ignore - ) + aiohttp.web.run_app(app, host=host, port=port, print=self.__run_app_print) async def __root_handler(self, _: aiohttp.web.Request) -> aiohttp.web.Response: return aiohttp.web.Response(text="OK") @@ -96,6 +91,11 @@ class Server: # pylint: disable=too-many-instance-attributes break return ws + def __run_app_print(self, text: str) -> None: + logger = get_logger() + for line in text.strip().splitlines(): + logger.info(line.strip()) + async def __on_shutdown(self, _: aiohttp.web.Application) -> None: logger = get_logger(0) @@ -115,7 +115,7 @@ class Server: # pylint: disable=too-many-instance-attributes await self.__streamer.stop() @_system_task - async def __monitor_keyboard(self) -> None: + async def __keyboard_watchdog(self) -> None: while self.__keyboard.is_alive(): await asyncio.sleep(0.1) raise RuntimeError("Keyboard dead") |