From 654105e865a54f3cee018056c60457d752065aa2 Mon Sep 17 00:00:00 2001 From: jo Date: Sun, 26 Feb 2023 22:46:20 +0100 Subject: [PATCH] fix(playout): %else is not defined --- .../libretime_playout/liquidsoap/templates/outputs.liq.j2 | 5 +++-- playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 b/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 index 09c5e5f61..5f75d5abf 100644 --- a/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 +++ b/playout/libretime_playout/liquidsoap/templates/outputs.liq.j2 @@ -120,10 +120,11 @@ output.shoutcast( {% for output in config.stream.outputs.system -%} {% if output.enabled -%} # {{ output.kind.value }}:{{ loop.index }} +%ifndef output.{{ output.kind.value }} +log("output.{{ output.kind.value }} is not defined!") +%endif %ifdef output.{{ output.kind.value }} output.{{ output.kind.value }}(id="{{ output.kind.value }}:{{ loop.index }}", s) -%else -log("output.{{ output.kind.value }} is not defined!") %endif {% endif -%} diff --git a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr index 6218862c0..d135afab2 100644 --- a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr +++ b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr @@ -271,10 +271,11 @@ %include "/fake/1.4/ls_script.liq" # pulseaudio:1 + %ifndef output.pulseaudio + log("output.pulseaudio is not defined!") + %endif %ifdef output.pulseaudio output.pulseaudio(id="pulseaudio:1", s) - %else - log("output.pulseaudio is not defined!") %endif