From 553086bc92196b72c9640bfd7b4f9b65543fd057 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 13 Jan 2023 18:17:15 -0600
Subject: [PATCH] Update mm-scripts.sh

---
 mm-scripts.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/mm-scripts.sh b/mm-scripts.sh
index b936bbe..4dcb75f 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -72,7 +72,7 @@ MMSTART(){
 			sleep 5m
 			"${VPN_START[@]}" &
 			sleep 30s
-			rm -f /opt/idssys/mediamanager/mm.stop
+			rm -f /opt/idssys/mediamanager/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1	
 		elif [ -f /opt/idssys/mediamanager/mm.vpn.fail2 ]; then
@@ -90,7 +90,7 @@ MMSTART(){
 			sleep 30s
 			"${VPN_START[@]}" &
 			sleep 30s
-			rm -f /opt/idssys/mediamanager/mm.stop
+			rm -f /opt/idssys/mediamanager/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1
 		fi
@@ -130,7 +130,7 @@ MMSTART(){
 				sleep 2m
 				"${VPN_START[@]}" &
 				sleep 1m
-				rm -f /opt/idssys/mediamanager/mm.stop
+				rm -f /opt/idssys/mediamanager/mm.stop*
 				[ $VERBOSE = true ] && DEBUGLOGSTOP
 				exit 1
 			fi
@@ -160,7 +160,7 @@ MMSTART(){
 				sleep 2m
 				"${VPN_START[@]}" &
 				sleep 1m
-				rm -f /opt/idssys/mediamanager/mm.stop
+				rm -f /opt/idssys/mediamanager/mm.stop*
 				[ $VERBOSE = true ] && DEBUGLOGSTOP
 				exit 1
 			fi
@@ -180,7 +180,7 @@ MMSTART(){
 			sleep 2m
 			"${VPN_START[@]}" &
 			sleep 1m
-			rm -f /opt/idssys/mediamanager/mm.stop
+			rm -f /opt/idssys/mediamanager/mm.stop*
 			[ $VERBOSE = true ] && DEBUGLOGSTOP
 			exit 1
 		fi
@@ -200,7 +200,7 @@ MMSTART(){
 			[ "${EMAIL_NOTICE}" != "" ] && echo "VPN issue has been fixed" | mail -s "Services Restored" ${EMAIL_NOTICE}
 			rm -f /opt/idssys/mediamanager/mm.vpn.fail*
 		fi
-		rm -f /opt/idssys/mediamanager/mm.stop
+		rm -f /opt/idssys/mediamanager/mm.stop*
 		echo -e "${idsCL[Green]}All systems are go!${idsCL[Default]}"
 		if [ "${1}" = "start" ] || [ "${1}" = "" ]; then
 			echo "$(date) - Media Management systems started" >> $logfile
@@ -363,12 +363,22 @@ if [ ! -f /opt/idssys/mediamanager/mm.update.stop ]; then
 	case $action in
 		start | check)
 			if [ -f /opt/idssys/mediamanager/mm.stop ] && [ "${action}" = "check" ]; then
-				echo -e "${stopmsg}"
-				# [ $VERBOSE = true ] && echo "$(date) - Not checking, system has been stopped" >> $logfile
-				echo
-				exit 1
+				if [ -f /opt/idssys/mediamanager/mm.stop.checking ]; then
+					checkstopped=`expr $(date +%s) - $(stat -c %Y /opt/idssys/mediamanager/mm.stop.checking)`
+					if [ $checkstopped -gt 1800 ]; then
+						rm -f /opt/idssys/mediamanager/mm.stop*
+					else
+						exit 1
+					fi
+				else
+					echo -e "${stopmsg}"
+					# [ $VERBOSE = true ] && echo "$(date) - Not checking, system has been stopped" >> $logfile
+					echo
+					exit 1
+				fi
 			fi
 			touch /opt/idssys/mediamanager/mm.stop
+			[ "${action}" = "check" ] && touch /opt/idssys/mediamanager/mm.stop.checking
 			MMSTART ${action};;
 		
 		stop)