From c598ef60022e400bad454b84f3bac0ded301d1e9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 13 Mar 2024 12:53:26 +0100 Subject: [PATCH] use mp2 and webm flags instead of audio and video --- bin/monitoring/check_telecaster.py | 7 ++++--- bin/streaming/telecaster.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/monitoring/check_telecaster.py b/bin/monitoring/check_telecaster.py index b2dfe50..a9d60c7 100755 --- a/bin/monitoring/check_telecaster.py +++ b/bin/monitoring/check_telecaster.py @@ -13,8 +13,8 @@ class TelecasterCheck: {'proc': 'Xtigervnc', 'args': ''}, {'proc': 'gst-launch-1.0', 'args': 'lamemp3enc'}, {'proc': 'gst-launch-1.0', 'args': 'vp8enc'}, - {'proc': 'deefuzzer', 'args': '/tmp/telecaster_deefuzzer_audio_monitor.yml'}, - {'proc': 'deefuzzer', 'args': '/tmp/telecaster_deefuzzer_video_monitor.yml'}, + {'proc': 'deefuzzer', 'args': 'mp3'}, + {'proc': 'deefuzzer', 'args': 'webm'}, ] log_path = '/var/log/telecaster/' @@ -35,7 +35,8 @@ class TelecasterCheck: if proc.cmdline(): if name == proc.name(): if args: - if args in proc.cmdline()[1:]: + #print(proc.cmdline()) + if args in proc.cmdline()[1:] or args in ' '.join(proc.cmdline()[1:]) : return proc.pid else: return proc.pid diff --git a/bin/streaming/telecaster.py b/bin/streaming/telecaster.py index 155907e..2223f54 100755 --- a/bin/streaming/telecaster.py +++ b/bin/streaming/telecaster.py @@ -88,8 +88,8 @@ class TeleCaster(Thread): conf_file = open(conf_file_path, 'r') self.conf = yaml.safe_load(conf_file)["telecaster"] self.stream_types = ["audio", "video"] - self.deefuzzer_video_conf_file = "/tmp/telecaster_deefuzzer_video_monitor.yml" - self.deefuzzer_audio_conf_file = "/tmp/telecaster_deefuzzer_audio_monitor.yml" + self.deefuzzer_video_conf_file = "/tmp/telecaster_deefuzzer_webm_monitor.yml" + self.deefuzzer_audio_conf_file = "/tmp/telecaster_deefuzzer_mp3_monitor.yml" # print(self.conf) def write_conf(self, conf_dict, path): -- 2.39.5