diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index d4b50d088..c0e4aa3a9 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -112,7 +112,6 @@ def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[ message_handler.start() file_thread = PypoFile(file_queue, api_client) - file_thread.daemon = True file_thread.start() fetch_thread = PypoFetch( @@ -125,15 +124,12 @@ def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[ api_client, legacy_client, ) - fetch_thread.daemon = True fetch_thread.start() push_thread = PypoPush(push_queue, pypo_liquidsoap, config) - push_thread.daemon = True push_thread.start() recorder_thread = Recorder(recorder_queue, config, legacy_client) - recorder_thread.daemon = True recorder_thread.start() stats_collector_thread = StatsCollectorThread(config, legacy_client) diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index 192de055a..3517e53b5 100644 --- a/playout/libretime_playout/player/fetch.py +++ b/playout/libretime_playout/player/fetch.py @@ -34,6 +34,7 @@ signal.signal(signal.SIGTERM, shutdown_handler) class PypoFetch(Thread): name = "fetch" + daemon = True def __init__( self, diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py index 1d25079fb..23cefd1e7 100644 --- a/playout/libretime_playout/player/file.py +++ b/playout/libretime_playout/player/file.py @@ -12,6 +12,7 @@ from requests.exceptions import ConnectionError, HTTPError, Timeout class PypoFile(Thread): name = "file" + daemon = True def __init__( self, diff --git a/playout/libretime_playout/player/push.py b/playout/libretime_playout/player/push.py index b55413ba2..535c457c8 100644 --- a/playout/libretime_playout/player/push.py +++ b/playout/libretime_playout/player/push.py @@ -21,6 +21,7 @@ def is_file(media_item): class PypoPush(Thread): name = "push" + daemon = True def __init__( self, @@ -41,7 +42,6 @@ class PypoPush(Thread): self.pypo_liquidsoap = pypo_liquidsoap self.plq = PypoLiqQueue(self.future_scheduled_queue, self.pypo_liquidsoap) - self.plq.daemon = True self.plq.start() def main(self): diff --git a/playout/libretime_playout/player/queue.py b/playout/libretime_playout/player/queue.py index d77eaabb6..09dbb456c 100644 --- a/playout/libretime_playout/player/queue.py +++ b/playout/libretime_playout/player/queue.py @@ -22,6 +22,7 @@ signal.signal(signal.SIGTERM, shutdown_handler) class PypoLiqQueue(Thread): name = "liquidsoap_queue" + daemon = True def __init__( self, diff --git a/playout/libretime_playout/recorder.py b/playout/libretime_playout/recorder.py index 692ff9903..9b527076b 100644 --- a/playout/libretime_playout/recorder.py +++ b/playout/libretime_playout/recorder.py @@ -173,6 +173,9 @@ class ShowRecorder(Thread): class Recorder(Thread): + name = "recorder" + daemon = True + def __init__(self, q, config: Config, legacy_client: LegacyClient): Thread.__init__(self) self.legacy_client = legacy_client