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

receiving ustreamer signals

Browse Source
This commit is contained in:
Devaev Maxim
2020-03-04 04:18:35 +03:00
parent 52e117df3c
commit 779a9f1d15
14 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@@ -47,7 +47,7 @@ depends=(
patch
sudo
raspberrypi-io-access
"ustreamer>=1.9"
"ustreamer>=1.13"
)
makedepends=(python-setuptools)
source=("$url/archive/v$pkgver.tar.gz")

1
configs/kvmd/main/v0-hdmi-rpi2.yaml
View File

@@ -47,6 +47,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v0-hdmi-rpi3.yaml
View File

@@ -47,6 +47,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v0-vga-rpi2.yaml
View File

@@ -48,6 +48,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v0-vga-rpi3.yaml
View File

@@ -48,6 +48,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v1-hdmi-rpi2.yaml
View File

@@ -52,6 +52,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v1-hdmi-rpi3.yaml
View File

@@ -52,6 +52,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v1-vga-rpi2.yaml
View File

@@ -56,6 +56,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v1-vga-rpi3.yaml
View File

@@ -56,6 +56,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v2-hdmi-rpi4.yaml
View File

@@ -49,6 +49,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

1
configs/kvmd/main/v2-hdmi-zerow.yaml
View File

@@ -49,6 +49,7 @@ kvmd:
- "--unix-mode=0660"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"
ipmi:

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

@@ -29,6 +29,7 @@ from typing import List
from typing import Dict
from typing import AsyncGenerator
from typing import Optional
from typing import Any
import aiohttp
@@ -197,13 +198,26 @@ class Streamer: # pylint: disable=too-many-instance-attributes
}
async def poll_state(self) -> AsyncGenerator[Dict, None]:
notifier = aiotools.AioNotifier()
def signal_handler(*_: Any) -> None:
get_logger(0).info("Got SIGUSR2, checking the stream state ...")
asyncio.ensure_future(notifier.notify())
get_logger(0).info("Installing SIGUSR2 streamer handler ...")
asyncio.get_event_loop().add_signal_handler(signal.SIGUSR2, signal_handler)
prev_state: Dict = {}
while True:
state = await self.get_state()
if state != prev_state:
yield state
prev_state = state
await asyncio.sleep(self.__state_poll)
await asyncio.wait([
asyncio.sleep(self.__state_poll),
notifier.wait(),
], return_when=asyncio.FIRST_COMPLETED)
async def get_info(self) -> Dict:
proc = await asyncio.create_subprocess_exec(

1
testenv/v1-vga-rpi3.override.yaml
View File

@@ -21,4 +21,5 @@ kvmd:
- "--unix-mode=0666"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"

1
testenv/v2-hdmi-rpi4.override.yaml
View File

@@ -29,4 +29,5 @@ kvmd:
- "--unix-mode=0666"
- "--exit-on-parent-death"
- "--process-name-prefix={process_name_prefix}"
- "--notify-parent"
- "--no-log-colors"