From b1c2e34cebbbb130abcbb32b81f323e9ea746071 Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 8 Sep 2022 17:58:34 +0200 Subject: [PATCH] fix(playout): remove shutdown_handler --- playout/libretime_playout/main.py | 9 --------- playout/libretime_playout/player/fetch.py | 11 ----------- playout/libretime_playout/player/queue.py | 11 ----------- 3 files changed, 31 deletions(-) diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index c0e4aa3a9..228ea6a21 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -2,7 +2,6 @@ Python part of radio playout (pypo) """ -import signal import sys import time from datetime import datetime @@ -30,11 +29,6 @@ from .player.push import PypoPush from .recorder import Recorder -def shutdown_handler(signum, frame): - logger.info("shutting down") - sys.exit(0) - - @click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) @cli_logging_options() @cli_config_options() @@ -63,9 +57,6 @@ def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[ logger.info("Timezone: %s" % str(time.tzname)) logger.info("UTC time: %s" % str(datetime.utcnow())) - signal.signal(signal.SIGINT, shutdown_handler) - signal.signal(signal.SIGTERM, shutdown_handler) - legacy_client = LegacyClient() api_client = ApiClient( base_url=config.general.public_url, diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index 3517e53b5..121bc2259 100644 --- a/playout/libretime_playout/player/fetch.py +++ b/playout/libretime_playout/player/fetch.py @@ -2,8 +2,6 @@ import copy import json import mimetypes import os -import signal -import sys import time from datetime import datetime from queue import Empty, Queue @@ -23,15 +21,6 @@ from .liquidsoap import PypoLiquidsoap from .schedule import get_schedule -def shutdown_handler(signum, frame): - logger.info("shutting down") - sys.exit(0) - - -signal.signal(signal.SIGINT, shutdown_handler) -signal.signal(signal.SIGTERM, shutdown_handler) - - class PypoFetch(Thread): name = "fetch" daemon = True diff --git a/playout/libretime_playout/player/queue.py b/playout/libretime_playout/player/queue.py index 09dbb456c..13e0735b0 100644 --- a/playout/libretime_playout/player/queue.py +++ b/playout/libretime_playout/player/queue.py @@ -1,5 +1,3 @@ -import signal -import sys from collections import deque from datetime import datetime from queue import Empty, Queue @@ -11,15 +9,6 @@ from ..utils import seconds_between from .liquidsoap import PypoLiquidsoap -def shutdown_handler(signum, frame): - logger.info("shutting down") - sys.exit(0) - - -signal.signal(signal.SIGINT, shutdown_handler) -signal.signal(signal.SIGTERM, shutdown_handler) - - class PypoLiqQueue(Thread): name = "liquidsoap_queue" daemon = True