From: yomguy <yomguy@parisson.com>
Date: Mon, 13 Jan 2014 18:14:05 +0000 (+0100)
Subject: add monitor check start & stop routines
X-Git-Tag: 1.0~3^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9eca05b1bb469e0d353c5ffa0a30166b260814c5;p=telecaster-server.git

add monitor check start & stop routines
---

diff --git a/tcserver/conf/etc/init.d/telecaster b/tcserver/conf/etc/init.d/telecaster
index 698f16a..412789c 100755
--- 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 68ea526..e5d635f 100755
--- 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