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

better pstrun logging

Browse Source
This commit is contained in:
Maxim Devaev 2022-06-19 22:30:29 +03:00
parent a70800323e
commit 4de5b40fb8
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kvmd/apps/pstrun/__init__.py
View File

@ -47,7 +47,7 @@ async def _run_cmd_ws(cmd: List[str], ws: aiohttp.ClientWebSocketResponse) -> in
receive_task: Optional[asyncio.Task] = None receive_task: Optional[asyncio.Task] = None
proc_task: Optional[asyncio.Task] = None proc_task: Optional[asyncio.Task] = None
proc: Optional[asyncio.subprocess.Process] = None # pylint: disable=no-member proc: Optional[asyncio.subprocess.Process] = None # pylint: disable=no-member
retval = 1
try: # pylint: disable=too-many-nested-blocks try: # pylint: disable=too-many-nested-blocks
while True: while True:
if receive_task is None: if receive_task is None:
@ -64,6 +64,8 @@ async def _run_cmd_ws(cmd: List[str], ws: aiohttp.ClientWebSocketResponse) -> in
(event_type, event) = htserver.parse_ws_event(msg.data) (event_type, event) = htserver.parse_ws_event(msg.data)
if event_type == "storage_state": if event_type == "storage_state":
if event["data"]["write_allowed"] and proc is None: if event["data"]["write_allowed"] and proc is None:
logger.info("PST write is allowed: %s", event["data"]["path"])
logger.info("Running the process ...")
proc = (await asyncio.create_subprocess_exec( proc = (await asyncio.create_subprocess_exec(
*cmd, *cmd,
preexec_fn=os.setpgrp, preexec_fn=os.setpgrp,
@ -81,12 +83,10 @@ async def _run_cmd_ws(cmd: List[str], ws: aiohttp.ClientWebSocketResponse) -> in
receive_task = None receive_task = None
if proc_task in done: if proc_task in done:
assert proc is not None
assert proc.returncode is not None
logger.info("Process finished: returncode=%s", proc.returncode)
break break
except Exception:
logger.exception("Unhandled exception")
finally:
if receive_task: if receive_task:
receive_task.cancel() receive_task.cancel()
if proc_task: if proc_task:
@ -94,11 +94,13 @@ async def _run_cmd_ws(cmd: List[str], ws: aiohttp.ClientWebSocketResponse) -> in
if proc is not None: if proc is not None:
await aioproc.kill_process(proc, 1, logger) await aioproc.kill_process(proc, 1, logger)
assert proc.returncode is not None assert proc.returncode is not None
retval = proc.returncode logger.info("Process finished: returncode=%d", proc.returncode)
return retval return proc.returncode
return 1
async def _run_cmd(cmd: List[str], unix_path: str) -> None: async def _run_cmd(cmd: List[str], unix_path: str) -> None:
get_logger(0).info("Opening PST session ...")
async with aiohttp.ClientSession( async with aiohttp.ClientSession(
headers={"User-Agent": htclient.make_user_agent("KVMD-PSTRun")}, headers={"User-Agent": htclient.make_user_agent("KVMD-PSTRun")},
connector=aiohttp.UnixConnector(path=unix_path), connector=aiohttp.UnixConnector(path=unix_path),