From b37f4f75094fafbccbd22a9209b32f77bbbce74f Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 14 Jan 2022 16:49:43 +0100 Subject: [PATCH] fix(playout): optional log_file for liquidsoap --- playout/libretime_liquidsoap/1.1/ls_script.liq | 7 ++++++- playout/libretime_liquidsoap/1.3/ls_script.liq | 7 ++++++- playout/libretime_liquidsoap/1.4/ls_script.liq | 7 ++++++- playout/libretime_liquidsoap/generate_liquidsoap_cfg.py | 5 +++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/playout/libretime_liquidsoap/1.1/ls_script.liq b/playout/libretime_liquidsoap/1.1/ls_script.liq index c494b151d..6e9286a24 100644 --- a/playout/libretime_liquidsoap/1.1/ls_script.liq +++ b/playout/libretime_liquidsoap/1.1/ls_script.liq @@ -1,6 +1,11 @@ %include "/etc/airtime/liquidsoap.cfg" -set("log.file.path", log_file) +if (log_file != "") then + set("log.file.path", log_file) +else + set("log.file", false) +end + set("server.telnet", true) set("server.telnet.port", 1234) diff --git a/playout/libretime_liquidsoap/1.3/ls_script.liq b/playout/libretime_liquidsoap/1.3/ls_script.liq index d8bbc9a9b..2acc1d327 100644 --- a/playout/libretime_liquidsoap/1.3/ls_script.liq +++ b/playout/libretime_liquidsoap/1.3/ls_script.liq @@ -1,6 +1,11 @@ %include "/etc/airtime/liquidsoap.cfg" -set("log.file.path", log_file) +if (log_file != "") then + set("log.file.path", log_file) +else + set("log.file", false) +end + set("server.telnet", true) set("server.telnet.port", 1234) diff --git a/playout/libretime_liquidsoap/1.4/ls_script.liq b/playout/libretime_liquidsoap/1.4/ls_script.liq index d43edde3a..a51fdefea 100644 --- a/playout/libretime_liquidsoap/1.4/ls_script.liq +++ b/playout/libretime_liquidsoap/1.4/ls_script.liq @@ -1,6 +1,11 @@ %include "/etc/airtime/liquidsoap.cfg" -set("log.file.path", log_file) +if (log_file != "") then + set("log.file.path", log_file) +else + set("log.file", false) +end + set("server.telnet", true) set("server.telnet.port", 1234) diff --git a/playout/libretime_liquidsoap/generate_liquidsoap_cfg.py b/playout/libretime_liquidsoap/generate_liquidsoap_cfg.py index 0c2694382..6a52598ee 100644 --- a/playout/libretime_liquidsoap/generate_liquidsoap_cfg.py +++ b/playout/libretime_liquidsoap/generate_liquidsoap_cfg.py @@ -36,8 +36,9 @@ def generate_liquidsoap_config(ss, log_filepath: Optional[Path]): fh.write("ignore(%s)\n" % key) auth_path = os.path.dirname(os.path.realpath(__file__)) - if log_filepath is not None: - fh.write(f'log_file = "{log_filepath.resolve()}"\n') + log_file = log_filepath.resolve() if log_filepath is not None else "" + + fh.write(f'log_file = "{log_file}"\n') fh.write('auth_path = "%s/liquidsoap_auth.py"\n' % auth_path) fh.close()