use mp2 and webm flags instead of audio and video

diff --git a/bin/monitoring/check_telecaster.py b/bin/monitoring/check_telecaster.py
index b2dfe50c26b66058a705e1b5a4d3499137b26242..a9d60c70fe4c7924904b658cb0305b2281376287 100755 (executable)
--- 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 155907edbb4041558de4f756a44f709732a3d7a5..2223f54ad8c7062039eb661c6ec3db9c12a231cc 100755 (executable)
--- 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):