GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

better logging

Browse Source
This commit is contained in:
Maxim Devaev 2022-06-19 19:54:24 +03:00
parent 17865348f2
commit 4aa7a21b55
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kvmd/apps/pst/server.py
View File

@ -75,8 +75,8 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
# ===== SYSTEM STUFF # ===== SYSTEM STUFF
async def _init_app(self) -> None: async def _init_app(self) -> None:
if (await self.__remount_storage(True)): if (await self.__remount_storage(rw=True)):
await self.__remount_storage(False) await self.__remount_storage(rw=False)
aiotools.create_deadly_task("Controller", self.__controller()) aiotools.create_deadly_task("Controller", self.__controller())
self._add_exposed(self) self._add_exposed(self)
@ -92,7 +92,7 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
async def _on_cleanup(self) -> None: async def _on_cleanup(self) -> None:
logger = get_logger(0) logger = get_logger(0)
await self.__remount_storage(False) await self.__remount_storage(rw=False)
logger.info("On-Cleanup complete") logger.info("On-Cleanup complete")
async def _on_ws_opened(self) -> None: async def _on_ws_opened(self) -> None:
@ -104,14 +104,15 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
# ===== SYSTEM TASKS # ===== SYSTEM TASKS
async def __controller(self) -> None: async def __controller(self) -> None:
logger = get_logger(0)
prev: int = 0 prev: int = 0
while True: while True:
cur = len(self._get_wss()) cur = len(self._get_wss())
if cur > 0: if cur > 0:
if not self.__is_write_available(): if not self.__is_write_available():
await self.__remount_storage(True) await self.__remount_storage(rw=True)
elif prev > 0 and cur == 0: elif prev > 0 and cur == 0:
while not (await self.__remount_storage(False)): while not (await self.__remount_storage(rw=False)):
if len(self._get_wss()) > 0: if len(self._get_wss()) > 0:
continue continue
await asyncio.sleep(self.__ro_retries_delay) await asyncio.sleep(self.__ro_retries_delay)

1
kvmd/helpers/remount/__init__.py
View File

@ -119,3 +119,4 @@ def main() -> None:
_mkdir(path) _mkdir(path)
if storage.user: if storage.user:
_chown(path, storage.user) _chown(path, storage.user)
_log(f"Storage in the {'RW' if rw else 'RO'}-mode now")