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

janus runner draft

Browse Source
This commit is contained in:
Devaev Maxim
2021-05-24 05:03:45 +03:00
parent 9cead62032
commit 19a68887e4
17 changed files with 565 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kvmd/apps/kvmd/streamer.py
View File

@@ -435,26 +435,6 @@ class Streamer: # pylint: disable=too-many-instance-attributes
get_logger(0).info("Started streamer pid=%d: %s", self.__streamer_proc.pid, cmd)
async def __kill_streamer_proc(self) -> None:
logger = get_logger(0)
if self.__streamer_proc and self.__streamer_proc.returncode is None:
try:
self.__streamer_proc.terminate()
await asyncio.sleep(1)
if self.__streamer_proc.returncode is None:
try:
self.__streamer_proc.kill()
except Exception:
if self.__streamer_proc.returncode is not None:
raise
await self.__streamer_proc.wait()
logger.info("Streamer killed: pid=%d; retcode=%d",
self.__streamer_proc.pid, self.__streamer_proc.returncode)
except asyncio.CancelledError:
pass
except Exception:
if self.__streamer_proc.returncode is None:
logger.exception("Can't kill streamer pid=%d", self.__streamer_proc.pid)
else:
logger.info("Streamer killed: pid=%d; retcode=%d",
self.__streamer_proc.pid, self.__streamer_proc.returncode)
if self.__streamer_proc:
await aioproc.kill_process(self.__streamer_proc, 1, get_logger(0))
self.__streamer_proc = None