add monitor check start & stop routines

diff --git a/tcserver/conf/etc/init.d/telecaster b/tcserver/conf/etc/init.d/telecaster
index 698f16ad3066776f9b523d986abbe2b27c81dc9d..412789cafcff4103debe0de174df2cf0ac04a556 100755 (executable)
--- a/tcserver/conf/etc/init.d/telecaster
+++ b/tcserver/conf/etc/init.d/telecaster
@@ -49,14 +49,15 @@ case "$1" in
                log_begin_msg "Stopping telecaster streaming vncserver:" "telecaster"
                 pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
                if [ ! pid = '' ]; then
+                       su -c "pkill -9 -f \"python /usr/local/share/telecaster/scripts/monitor_check.py\" "
                        su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml\" "
                        su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml\" "
-            su -c "pkill -9 gst-launch-0.10" $USER
+                       su -c "pkill -9 gst-launch-0.10" $USER
                        sleep 1
-            su -c "vncserver -kill :$PORT" $USER
-               log_end_msg 0
-       else
-               log_end_msg 1
+                       su -c "vncserver -kill :$PORT" $USER
+                       log_end_msg 0
+               else
+                       log_end_msg 1
                exit 1
            fi
                 rm $PIDFILE

diff --git a/tcserver/conf/etc/init.d/telecaster-vnc b/tcserver/conf/etc/init.d/telecaster-vnc
index 68ea526005c46c91b3fc92200ba0c549b6e2b5ff..e5d635f7bb833a759208e7ee75f8d0e904c1b39e 100755 (executable)
--- a/tcserver/conf/etc/init.d/telecaster-vnc
+++ b/tcserver/conf/etc/init.d/telecaster-vnc
@@ -51,11 +51,12 @@ case "$1" in
                if [ ! pid = '' ]; then
                        #su -c "pkill -9 -f \"/usr/local/bin/deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml\" " $USER
                        #su -c "pkill -9 -f \"/usr/local/bin/deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml\" " $USER
-                    su -c "pkill -9 gst-launch-0.10" $USER
+                       su -c "pkill -9 -f \"python /usr/local/share/telecaster/scripts/monitor_check.py\" "
+                       su -c "pkill -9 gst-launch-0.10" $USER
                        sleep 1
                         su -c "vncserver -kill :$PORT" $USER
                        log_end_msg 0
-               else
+               else
                        log_end_msg 1
                        exit 1
                fi