From 58ad40f997b58566935f6e388abe91bfca3bf1af Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sat, 16 Jul 2022 23:11:20 +0200
Subject: [PATCH] chore(playout): use 'entrypoint' generic module name
---
.../liquidsoap/{generate_liquidsoap_cfg.py => entrypoint.py} | 2 +-
playout/libretime_playout/liquidsoap/main.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
rename playout/libretime_playout/liquidsoap/{generate_liquidsoap_cfg.py => entrypoint.py} (97%)
diff --git a/playout/libretime_playout/liquidsoap/generate_liquidsoap_cfg.py b/playout/libretime_playout/liquidsoap/entrypoint.py
similarity index 97%
rename from playout/libretime_playout/liquidsoap/generate_liquidsoap_cfg.py
rename to playout/libretime_playout/liquidsoap/entrypoint.py
index 7c3a28545..c78876e23 100644
--- a/playout/libretime_playout/liquidsoap/generate_liquidsoap_cfg.py
+++ b/playout/libretime_playout/liquidsoap/entrypoint.py
@@ -43,7 +43,7 @@ def generate_liquidsoap_config(ss, log_filepath: Optional[Path]):
fh.close()
-def run(log_filepath: Optional[Path]):
+def generate_entrypoint(log_filepath: Optional[Path]):
attempts = 0
max_attempts = 10
successful = False
diff --git a/playout/libretime_playout/liquidsoap/main.py b/playout/libretime_playout/liquidsoap/main.py
index 8f61bf291..a849ce9f4 100644
--- a/playout/libretime_playout/liquidsoap/main.py
+++ b/playout/libretime_playout/liquidsoap/main.py
@@ -11,7 +11,7 @@ from libretime_shared.config import DEFAULT_ENV_PREFIX
from libretime_shared.logging import level_from_name, setup_logger
from loguru import logger
-from . import generate_liquidsoap_cfg
+from .entrypoint import generate_entrypoint
@click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX})
@@ -23,7 +23,8 @@ def cli(log_level: int, log_filepath: Optional[Path]):
log_level = level_from_name(log_level)
setup_logger(log_level, log_filepath)
- generate_liquidsoap_cfg.run(log_filepath)
+ generate_entrypoint(log_filepath)
+
# check liquidsoap version so we can run a scripts matching the liquidsoap minor version
liquidsoap_version = subprocess.check_output(
"liquidsoap 'print(liquidsoap.version) shutdown()'",