GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed cleanup message for plugins

Browse Source
This commit is contained in:
Devaev Maxim
2019-09-12 03:14:43 +03:00
parent 57b8df0106
commit 22d329c1fb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kvmd/apps/kvmd/server.py
View File

@@ -42,6 +42,8 @@ import setproctitle
from ...logging import get_logger from ...logging import get_logger
from ...plugins import BasePlugin
from ...plugins.hid import BaseHid from ...plugins.hid import BaseHid
from ...plugins.atx import AtxOperationError from ...plugins.atx import AtxOperationError
@@ -570,18 +572,20 @@ class Server: # pylint: disable=too-many-instance-attributes
async def __on_cleanup(self, _: aiohttp.web.Application) -> None: async def __on_cleanup(self, _: aiohttp.web.Application) -> None:
logger = get_logger(0) logger = get_logger(0)
for obj in [ for (name, obj) in [
self._auth_manager, ("Auth manager", self._auth_manager),
self.__streamer, ("Streamer", self.__streamer),
self.__msd, ("MSD", self.__msd),
self.__atx, ("ATX", self.__atx),
self.__hid, ("HID", self.__hid),
]: ]:
logger.info("Cleaning up %s ...", type(obj).__name__) if isinstance(obj, BasePlugin):
name = f"{name} ({obj.get_plugin_name()})"
logger.info("Cleaning up %s ...", name)
try: try:
await obj.cleanup() # type: ignore await obj.cleanup() # type: ignore
except Exception: except Exception:
logger.exception("Cleanup error on %s", type(obj).__name__) logger.exception("Cleanup error on %s", name)
async def __broadcast_event(self, event_type: _Events, event_attrs: Dict) -> None: async def __broadcast_event(self, event_type: _Events, event_attrs: Dict) -> None:
if self.__sockets: if self.__sockets: