From 27b20c8d6a10ab39b3ace766d247f60a8d7ee4c7 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 23 May 2023 21:25:48 -0500
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 94 ++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index 9863935a..1cc971ef 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -74,37 +74,37 @@ STATUS(){
 				fi
 				
 				if [ "$(systemctl is-active ${srvc})" != "active" ]; then
-					if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down ]; then
+					if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ]; then
 						if [ "${ST_ACTION}" != "check" ]; then
 							echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
 						fi
 						SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is down" 1
-						touch ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down
+						touch ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down
 						echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE}
 					else
-						errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down)
+						errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down)
 						if [ $errtime -gt ${RENOTIFY} ]; then
-							if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.errtime ]; then
-								mv ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.errtime
+							if [ ! -f ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ]; then
+								mv ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime
 							fi
-							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.errtime)
+							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime)
 							if [ "${ST_ACTION}" != "check" ]; then
 								echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 							fi
-							touch ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down
+							touch ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down
 						fi
 					fi
 				else
 					if [ "${ST_ACTION}" != "check" ]; then
 						echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 					fi
-					if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down ]; then
-						if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.errtime ]; then
-							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.errtime)
+					if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ]; then
+						if [ -f ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ]; then
+							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime)
 						else
-							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down)
+							toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down)
 						fi
-						rm -f ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.*
+						rm -f ${TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.*
 						SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
 						echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICES[${srvc}]} is back up" >> ${LOGFILE}
 						
@@ -197,17 +197,17 @@ STATUS(){
 									fi
 									# echo "mysqlgo=${mysqlgo}"
 									if [ "${srvctst[$sr]}" != "active" ] && [ "${mysqlgo}" != "true" ]; then
-										if [ ! -f ${TMPFOLDER}/${nip}.${srvc}.down ]; then
+										if [ ! -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then
 											[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-											touch ${TMPFOLDER}/${nip}.${srvc}.down
+											touch ${TMPFOLDER}/${nip}~${srvc}.down
 											# SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1
 											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE}
 										else
-											errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.down)
+											errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down)
 											if [ $errtime -gt ${RENOTIFY} ]; then
-												[ ! -f ${TMPFOLDER}/${nip}.${srvc}.errtime ] && mv ${TMPFOLDER}/${nip}.${srvc}.down ${TMPFOLDER}/${nip}.${srvc}.errtime
-												toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.errtime)
-												touch ${TMPFOLDER}/${nip}.${srvc}.down
+												[ ! -f ${TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${TMPFOLDER}/${nip}~${srvc}.down ${TMPFOLDER}/${nip}~${srvc}.errtime
+												toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime)
+												touch ${TMPFOLDER}/${nip}~${srvc}.down
 												SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1
 												# ([ "${srvc}" == "mysql" ] || [ "${srvc}" == "mariadb" ]) && ${NCMD} systemctl restart ${srvc} &
 											
@@ -219,17 +219,17 @@ STATUS(){
 										fi
 									else
 										[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Running${idsCL[Default]}"
-										if [ -f ${TMPFOLDER}/${nip}.${srvc}.down ]; then
-											[ -f ${TMPFOLDER}/${nip}.${srvc}.errtime ] && toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.errtime) || toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.down)
+										if [ -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then
+											[ -f ${TMPFOLDER}/${nip}~${srvc}.errtime ] && toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime) || toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down)
 											SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
 											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE}
 
-											rm -f ${TMPFOLDER}/${nip}.${srvc}.*
+											rm -f ${TMPFOLDER}/${nip}~${srvc}.*
 
 										fi
 										# if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then
 										if [ "${srvc}" == "gitea" ]; then
-											rm -f ${FOLDER}/*.${srvc}.*
+											rm -f ${FOLDER}/*~${srvc}.*
 										fi
 									fi
 									[ "${mysqlgo}" = "true" ] && unset mysqlgo
@@ -267,22 +267,22 @@ STATUS(){
 							# 		fi
 							# 		# echo "mysqlgo=${mysqlgo}"
 							# 		if [ "${srvctst}" != "active" ] && [ "${mysqlgo}" != "true" ]; then
-							# 			if [ ! -f ${TMPFOLDER}/${nip}.${srvc}.down ]; then
+							# 			if [ ! -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then
 							# 					if [ "${ST_ACTION}" != "check" ]; then
 							# 						echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
 							# 					fi
 							# 					SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1
-							# 					touch ${TMPFOLDER}/${nip}.${srvc}.down
+							# 					touch ${TMPFOLDER}/${nip}~${srvc}.down
 							# 					echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE}
 							#
 							# 			else
-							# 				errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.down)
+							# 				errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down)
 							# 				if [ $errtime -gt ${RENOTIFY} ]; then
-							# 					if [ ! -f ${TMPFOLDER}/${nip}.${srvc}.errtime ]; then
-							# 						mv ${TMPFOLDER}/${nip}.${srvc}.down ${TMPFOLDER}/${nip}.${srvc}.errtime
+							# 					if [ ! -f ${TMPFOLDER}/${nip}~${srvc}.errtime ]; then
+							# 						mv ${TMPFOLDER}/${nip}~${srvc}.down ${TMPFOLDER}/${nip}~${srvc}.errtime
 							# 					fi
-							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.errtime)
-							# 					touch ${TMPFOLDER}/${nip}.${srvc}.down
+							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime)
+							# 					touch ${TMPFOLDER}/${nip}~${srvc}.down
 							# 					if [ "${srvc}" = "mysql" ]; then
 							# 						${NCMD} systemctl restart ${srvc}
 							# 					fi
@@ -295,23 +295,23 @@ STATUS(){
 							# 			if [ "${ST_ACTION}" != "check" ]; then
 							# 				echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 							# 			fi
-							# 			if [ -f ${TMPFOLDER}/${nip}.${srvc}.down ]; then
-							# 				if [ -f ${TMPFOLDER}/${nip}.${srvc}.errtime ]; then
-							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.errtime)
+							# 			if [ -f ${TMPFOLDER}/${nip}~${srvc}.down ]; then
+							# 				if [ -f ${TMPFOLDER}/${nip}~${srvc}.errtime ]; then
+							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.errtime)
 							# 				else
-							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}.${srvc}.down)
+							# 					toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${srvc}.down)
 							# 				fi
 							# 				SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
 							# 				echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is back up, it was down for $(SHOW_TIME ${toterrtime})" >> ${LOGFILE}
 							#
-							# 				rm -f ${TMPFOLDER}/${nip}.${srvc}.down
-							# 				rm -f ${TMPFOLDER}/${nip}.${srvc}.errtime
+							# 				rm -f ${TMPFOLDER}/${nip}~${srvc}.down
+							# 				rm -f ${TMPFOLDER}/${nip}~${srvc}.errtime
 							#
 							# 			fi
 							# 			# if [ "${srvc}" == "pdnsadmin.socket" ] || [ "${srvc}" == "pdnsadmin" ] || [ "${srvc}" == "gitea" ]; then
 							# 			if [ "${srvc}" == "gitea" ]; then
-							# 				rm -f ${FOLDER}/*.${srvc}.down
-							# 				rm -f ${FOLDER}/*.${srvc}.errtime
+							# 				rm -f ${FOLDER}/*~${srvc}.down
+							# 				rm -f ${FOLDER}/*~${srvc}.errtime
 							# 			fi
 							# 		fi
 							# 		[ "${mysqlgo}" = "true" ] && unset mysqlgo
@@ -351,29 +351,28 @@ STATUS(){
 												echo -e "${idsCL[Green]}Running - Fixed${idsCL[Default]}"
 											fi
 											SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is fixed"
-											rm -f ${TMPFOLDER}/${nip}-${docker}.down
-											rm -f ${TMPFOLDER}/${nip}-${docker}.errtime
+											rm -f ${TMPFOLDER}/${nip}~${docker}.*
 											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is fixed" >> ${LOGFILE}
 
 										else
 											if [ "${ST_ACTION}" != "check" ]; then
 												echo -e "${idsCL[Red]}Not Running - Could Not Fix!${idsCL[Default]}"
 										
-												if [ ! -f ${TMPFOLDER}/${nip}-${docker}.down ]; then
+												if [ ! -f ${TMPFOLDER}/${nip}~${docker}.down ]; then
 													SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_DOCKERS[${docker}]} is down" 1
-													touch ${TMPFOLDER}/${nip}-${docker}.down
+													touch ${TMPFOLDER}/${nip}~${docker}.down
 													echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_DOCKERS[${docker}]} (docker) is down" >> ${LOGFILE}
 												else
-													errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.down)
+													errtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${docker}.down)
 													if [ $errtime -gt ${RENOTIFY} ]; then
-														if [ ! -f ${TMPFOLDER}/${nip}-${docker}.errtime ]; then
-															mv ${TMPFOLDER}/${nip}-${docker}.down ${TMPFOLDER}/${nip}-${docker}.errtime
+														if [ ! -f ${TMPFOLDER}/${nip}~${docker}.errtime ]; then
+															mv ${TMPFOLDER}/${nip}~${docker}.down ${TMPFOLDER}/${nip}~${docker}.errtime
 														fi
-														toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}-${docker}.errtime)
+														toterrtime=`date +%s`-$(stat -c %Y ${TMPFOLDER}/${nip}~${docker}.errtime)
 														if [ "${ST_ACTION}" != "check" ]; then
 															echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 														fi
-														touch ${TMPFOLDER}/${nip}-${docker}.down
+														touch ${TMPFOLDER}/${nip}~${docker}.down
 													fi
 												fi
 										
@@ -383,8 +382,7 @@ STATUS(){
 										if [ "${ST_ACTION}" != "check" ]; then
 											echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 										fi
-										rm -f ${TMPFOLDER}/${nip}-${docker}.down
-										rm -f ${TMPFOLDER}/${nip}-${docker}.errtime
+										rm -f ${TMPFOLDER}/${nip}~${docker}.*
 									fi
 								fi
 							done