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

usefull stuff for kvmd

Browse Source
This commit is contained in:
Devaev Maxim
2018-06-27 23:24:50 +03:00
parent 4804aa53b5
commit 3fefb0d519
5 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kvmd/kvmd/__init__.py
View File

@@ -60,9 +60,10 @@ class _Application:
vga_power=self.__config["video"]["pinout"]["vga"],
sync_delay=self.__config["video"]["sync_delay"],
mjpg_streamer=self.__config["video"]["mjpg_streamer"],
loop=self.__loop,
)
self.__system_futures: List[asyncio.Future] = []
self.__system_tasks: List[asyncio.Task] = []
def run(self) -> None:
app = aiohttp.web.Application(loop=self.__loop)
@@ -71,10 +72,10 @@ class _Application:
app.on_shutdown.append(self.__on_shutdown)
app.on_cleanup.append(self.__on_cleanup)
self.__system_futures.extend([
asyncio.ensure_future(self.__poll_dead_sockets(), loop=self.__loop),
asyncio.ensure_future(self.__poll_atx_leds(), loop=self.__loop),
asyncio.ensure_future(self.__poll_streamer_events(), loop=self.__loop),
self.__system_tasks.extend([
self.__loop.create_task(self.__poll_dead_sockets()),
self.__loop.create_task(self.__poll_atx_leds()),
self.__loop.create_task(self.__poll_streamer_events()),
])
aiohttp.web.run_app(
@@ -109,9 +110,9 @@ class _Application:
logger = get_logger()
logger.info("Cancelling tasks ...")
for future in self.__system_futures:
future.cancel()
await asyncio.gather(*self.__system_futures)
for task in self.__system_tasks:
task.cancel()
await asyncio.gather(*self.__system_tasks)
logger.info("Cleaning up GPIO ...")
GPIO.cleanup()

19
kvmd/kvmd/streamer.py
View File

@@ -11,13 +11,14 @@ from RPi import GPIO
# =====
class Streamer:
class Streamer: # pylint: disable=too-many-instance-attributes
def __init__(
self,
cap_power: int,
vga_power: int,
sync_delay: float,
mjpg_streamer: Dict,
loop: asyncio.AbstractEventLoop,
) -> None:
self.__cap_power = self.__set_output_pin(cap_power)
@@ -30,9 +31,11 @@ class Streamer:
" -o 'output_http.so -p -l %(host)s %(port)s'"
) % (mjpg_streamer)
self.__loop = loop
self.__lock = asyncio.Lock()
self.__events_queue: asyncio.Queue = asyncio.Queue()
self.__proc_future: Optional[asyncio.Future] = None
self.__proc_task: Optional[asyncio.Task] = None
def __set_output_pin(self, pin: int) -> int:
GPIO.setup(pin, GPIO.OUT)
@@ -46,18 +49,18 @@ class Streamer:
async def start(self) -> None:
async with self.__lock:
get_logger().info("Starting mjpg_streamer ...")
assert not self.__proc_future
assert not self.__proc_task
await self.__set_hw_enabled(True)
self.__proc_future = asyncio.ensure_future(self.__process(), loop=asyncio.get_event_loop())
self.__proc_task = self.__loop.create_task(self.__process())
async def stop(self) -> None:
async with self.__lock:
get_logger().info("Stopping mjpg_streamer ...")
if self.__proc_future:
self.__proc_future.cancel()
await asyncio.gather(self.__proc_future, return_exceptions=True)
if self.__proc_task:
self.__proc_task.cancel()
await asyncio.gather(self.__proc_task, return_exceptions=True)
await self.__set_hw_enabled(False)
self.__proc_future = None
self.__proc_task = None
await self.__events_queue.put("mjpg_streamer stopped")
async def __set_hw_enabled(self, enabled: bool) -> None: