summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2019-10-11 23:43:59 +0300
committerDevaev Maxim <[email protected]>2019-10-11 23:43:59 +0300
commit74449c81ad6e6d5bb170b3113b6112fb91f6f445 (patch)
treeacda82c77feff668d1355826002cc9fa25dc32b4
parentf8a4f59e13461514cc81fb3eaa26c131644cc73a (diff)
set --process-name-prefix
-rw-r--r--PKGBUILD2
-rw-r--r--configs/kvmd/main/v0-hdmi.yaml1
-rw-r--r--configs/kvmd/main/v0-vga.yaml1
-rw-r--r--configs/kvmd/main/v1-hdmi.yaml1
-rw-r--r--configs/kvmd/main/v1-vga.yaml1
-rw-r--r--configs/kvmd/main/v2-hdmi.yaml1
-rw-r--r--kvmd/apps/__init__.py2
-rw-r--r--kvmd/apps/kvmd/streamer.py5
-rw-r--r--testenv/Dockerfile1
-rw-r--r--testenv/v1-vga.override.yaml1
10 files changed, 15 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index e2ecd909..f834c7a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -44,7 +44,7 @@ depends=(
make
patch
raspberrypi-io-access
- "ustreamer>=1.8"
+ "ustreamer>=1.9"
)
makedepends=(python-setuptools)
source=("$url/archive/v$pkgver.tar.gz")
diff --git a/configs/kvmd/main/v0-hdmi.yaml b/configs/kvmd/main/v0-hdmi.yaml
index 008f7769..3a673fee 100644
--- a/configs/kvmd/main/v0-hdmi.yaml
+++ b/configs/kvmd/main/v0-hdmi.yaml
@@ -50,6 +50,7 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0660"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"
ipmi:
diff --git a/configs/kvmd/main/v0-vga.yaml b/configs/kvmd/main/v0-vga.yaml
index f32fd324..98b9e286 100644
--- a/configs/kvmd/main/v0-vga.yaml
+++ b/configs/kvmd/main/v0-vga.yaml
@@ -44,6 +44,7 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0660"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"
ipmi:
diff --git a/configs/kvmd/main/v1-hdmi.yaml b/configs/kvmd/main/v1-hdmi.yaml
index 6f0e0cbb..c000d503 100644
--- a/configs/kvmd/main/v1-hdmi.yaml
+++ b/configs/kvmd/main/v1-hdmi.yaml
@@ -52,6 +52,7 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0660"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"
ipmi:
diff --git a/configs/kvmd/main/v1-vga.yaml b/configs/kvmd/main/v1-vga.yaml
index d716be94..aba64bb5 100644
--- a/configs/kvmd/main/v1-vga.yaml
+++ b/configs/kvmd/main/v1-vga.yaml
@@ -49,6 +49,7 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0660"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"
ipmi:
diff --git a/configs/kvmd/main/v2-hdmi.yaml b/configs/kvmd/main/v2-hdmi.yaml
index 8fb2b17e..34e74505 100644
--- a/configs/kvmd/main/v2-hdmi.yaml
+++ b/configs/kvmd/main/v2-hdmi.yaml
@@ -53,6 +53,7 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0660"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"
ipmi:
diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py
index c6f69fb2..bfb4263e 100644
--- a/kvmd/apps/__init__.py
+++ b/kvmd/apps/__init__.py
@@ -240,6 +240,8 @@ def _get_config_scheme() -> Dict:
"unix": Option("", type=valid_abs_path, only_if="!port", unpack_as="unix_path"),
"timeout": Option(2.0, type=valid_float_f01),
+ "process_name_prefix": Option("kvmd/streamer"),
+
"cmd": Option(["/bin/true"], type=valid_command),
},
},
diff --git a/kvmd/apps/kvmd/streamer.py b/kvmd/apps/kvmd/streamer.py
index 5a3ec0ee..b7f1826a 100644
--- a/kvmd/apps/kvmd/streamer.py
+++ b/kvmd/apps/kvmd/streamer.py
@@ -62,6 +62,8 @@ class Streamer: # pylint: disable=too-many-instance-attributes
unix_path: str,
timeout: float,
+ process_name_prefix: str,
+
cmd: List[str],
) -> None:
@@ -86,6 +88,8 @@ class Streamer: # pylint: disable=too-many-instance-attributes
self.__unix_path = unix_path
self.__timeout = timeout
+ self.__process_name_prefix = process_name_prefix
+
self.__cmd = cmd
self.__streamer_task: Optional[asyncio.Task] = None
@@ -248,6 +252,7 @@ class Streamer: # pylint: disable=too-many-instance-attributes
host=self.__host,
port=self.__port,
unix=self.__unix_path,
+ process_name_prefix=self.__process_name_prefix,
**self.__params,
)
for part in self.__cmd
diff --git a/testenv/Dockerfile b/testenv/Dockerfile
index 925ec928..a33af7b1 100644
--- a/testenv/Dockerfile
+++ b/testenv/Dockerfile
@@ -13,6 +13,7 @@ RUN pacman -Syu --noconfirm \
libjpeg \
libevent \
libutil-linux \
+ libbsd \
python \
python-pip \
python-tox \
diff --git a/testenv/v1-vga.override.yaml b/testenv/v1-vga.override.yaml
index 9a369317..d1eee78b 100644
--- a/testenv/v1-vga.override.yaml
+++ b/testenv/v1-vga.override.yaml
@@ -20,4 +20,5 @@ kvmd:
- "--unix-rm"
- "--unix-mode=0666"
- "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
- "--no-log-colors"