From 473c8d30c882ec7ed641442c746384729a01bfdb Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Tue, 17 Jan 2023 12:14:12 -0300 Subject: [PATCH] Fix prepare-log and when go2rtc is not present in config --- docker/rootfs/etc/s6-overlay/s6-rc.d/log-prepare/up | 2 +- docker/rootfs/usr/local/go2rtc/create_config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/log-prepare/up b/docker/rootfs/etc/s6-overlay/s6-rc.d/log-prepare/up index f0a9d251f..f90be02e8 100644 --- a/docker/rootfs/etc/s6-overlay/s6-rc.d/log-prepare/up +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/log-prepare/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-logs/run +/etc/s6-overlay/s6-rc.d/log-prepare/run diff --git a/docker/rootfs/usr/local/go2rtc/create_config.py b/docker/rootfs/usr/local/go2rtc/create_config.py index 20e8de494..4ad0b59f1 100644 --- a/docker/rootfs/usr/local/go2rtc/create_config.py +++ b/docker/rootfs/usr/local/go2rtc/create_config.py @@ -20,7 +20,7 @@ if config_file.endswith((".yaml", ".yml")): elif config_file.endswith(".json"): config = json.loads(raw_config) -go2rtc_config: dict[str, any] = config["go2rtc"] +go2rtc_config: dict[str, any] = config.get("go2rtc", {}) if not go2rtc_config.get("log", {}).get("format"): go2rtc_config["log"] = {"format": "text"}