fix(sync): avoid unnecessary uvc helper restarts
This commit is contained in:
parent
909b9c51fe
commit
c8cf0fd254
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -1642,7 +1642,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lesavka_client"
|
name = "lesavka_client"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-stream",
|
"async-stream",
|
||||||
@ -1676,7 +1676,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lesavka_common"
|
name = "lesavka_common"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
@ -1688,7 +1688,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lesavka_server"
|
name = "lesavka_server"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
|
|||||||
@ -4,7 +4,7 @@ path = "src/main.rs"
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "lesavka_client"
|
name = "lesavka_client"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lesavka_common"
|
name = "lesavka_common"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
|
|||||||
@ -669,7 +669,6 @@ cat <<'UNIT' | sudo tee /etc/systemd/system/lesavka-uvc.service >/dev/null
|
|||||||
Description=lesavka UVC control helper
|
Description=lesavka UVC control helper
|
||||||
After=lesavka-core.service
|
After=lesavka-core.service
|
||||||
Requires=lesavka-core.service
|
Requires=lesavka-core.service
|
||||||
RefuseManualStop=yes
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/local/bin/lesavka-uvc.sh
|
ExecStart=/usr/local/bin/lesavka-uvc.sh
|
||||||
@ -700,9 +699,11 @@ sudo rm -f /etc/systemd/system/lesavka-watchdog.timer \
|
|||||||
|
|
||||||
sudo systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
|
|
||||||
if systemctl is-active --quiet lesavka-uvc; then
|
if [[ "$UVC_ENV_CHANGED" == "1" ]] && systemctl is-active --quiet lesavka-uvc; then
|
||||||
sudo systemctl restart lesavka-uvc
|
sudo systemctl restart lesavka-uvc
|
||||||
echo "✅ lesavka-uvc restarted with the refreshed UVC runtime settings."
|
echo "✅ lesavka-uvc restarted with the refreshed UVC runtime settings."
|
||||||
|
elif systemctl is-active --quiet lesavka-uvc; then
|
||||||
|
echo "✅ lesavka-uvc already active; runtime settings unchanged."
|
||||||
else
|
else
|
||||||
echo "⚠️ lesavka-uvc is not active; start via lesavka-core dependency path."
|
echo "⚠️ lesavka-uvc is not active; start via lesavka-core dependency path."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -10,7 +10,7 @@ bench = false
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "lesavka_server"
|
name = "lesavka_server"
|
||||||
version = "0.14.23"
|
version = "0.14.24"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
autobins = false
|
autobins = false
|
||||||
|
|
||||||
|
|||||||
@ -69,6 +69,14 @@ fn server_install_pins_hdmi_camera_and_display_defaults() {
|
|||||||
SERVER_INSTALL.contains("video-output node did not appear after rebuild"),
|
SERVER_INSTALL.contains("video-output node did not appear after rebuild"),
|
||||||
"install script should explain why it refuses a half-applied UVC install"
|
"install script should explain why it refuses a half-applied UVC install"
|
||||||
);
|
);
|
||||||
|
assert!(
|
||||||
|
!SERVER_INSTALL.contains("RefuseManualStop=yes"),
|
||||||
|
"install script should not generate a UVC unit that blocks legitimate refreshes"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
SERVER_INSTALL.contains("lesavka-uvc already active; runtime settings unchanged."),
|
||||||
|
"install script should avoid unnecessary UVC restarts when nothing changed"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user