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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2018-06-30 00:04:32 +03:00
parent 5589ecbac4
commit c0ee171edb
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kvmd/kvmd/__init__.py
View File

@@ -30,7 +30,7 @@ def main() -> None:
cap_power=int(config["video"]["pinout"]["cap"]),
conv_power=int(config["video"]["pinout"]["conv"]),
sync_delay=float(config["video"]["sync_delay"]),
cmd=str(config["video"]["cmd"]),
cmd=list(map(str, config["video"]["cmd"])),
loop=loop,
)

11
kvmd/kvmd/streamer.py
View File

@@ -1,6 +1,7 @@
import asyncio
import asyncio.subprocess
from typing import List
from typing import Optional
from .logging import get_logger
@@ -15,10 +16,12 @@ class Streamer: # pylint: disable=too-many-instance-attributes
cap_power: int,
conv_power: int,
sync_delay: float,
cmd: str,
cmd: List[str],
loop: asyncio.AbstractEventLoop,
) -> None:
assert cmd, cmd
self.__cap_power = gpio.set_output(cap_power)
self.__conv_power = (gpio.set_output(conv_power) if conv_power > 0 else conv_power)
self.__sync_delay = sync_delay
@@ -60,8 +63,8 @@ class Streamer: # pylint: disable=too-many-instance-attributes
while True: # pylint: disable=too-many-nested-blocks
proc: Optional[asyncio.subprocess.Process] = None # pylint: disable=no-member
try:
proc = await asyncio.create_subprocess_shell(
self.__cmd,
proc = await asyncio.create_subprocess_exec(
*self.__cmd,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.STDOUT,
)
@@ -105,7 +108,7 @@ class Streamer: # pylint: disable=too-many-instance-attributes
if proc.returncode is not None:
raise
await proc.wait()
get_logger().info("Streamer killed: pid=%d; retcode=%d")
get_logger().info("Streamer killed: pid=%d; retcode=%d", proc.pid, proc.returncode)
except Exception:
if proc.returncode is None:
get_logger().exception("Can't kill streamer pid=%d", proc.pid)