From cbc7c0d1ed0cc71293e429e81593570c2cffb123 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 21 May 2023 20:16:48 -0500
Subject: [PATCH] update

---
 inc/status.inc      | 46 ++++++++++++++++++++++-----------------------
 nodemgmt-scripts.sh | 10 +++++-----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index aeefe87a..81023b38 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -62,35 +62,35 @@ 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
+								mv ${TMPFOLDER}/${NODE_HOSTNAME}.${srvc}.down ${TMPFOLDER}/${NODE_HOSTNAME}-${srvc}.errtime
 							fi
 							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}.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}.*
 						SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
@@ -185,17 +185,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
+												[ ! -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
+												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} &
 											
@@ -207,8 +207,8 @@ 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}
 
@@ -255,22 +255,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
+							# 						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
+							# 					touch ${TMPFOLDER}/${nip}.${srvc}.down
 							# 					if [ "${srvc}" = "mysql" ]; then
 							# 						${NCMD} systemctl restart ${srvc}
 							# 					fi
@@ -283,22 +283,22 @@ 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}.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}.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}.down
 							# 				rm -f ${FOLDER}/*-${srvc}.errtime
 							# 			fi
 							# 		fi
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index bff81e34..dbda97d3 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1074,14 +1074,14 @@ DOWNLIST(){
 		for downitem in ${DOWN_LIST}; do
 			ditem=${downitem##*/}
 			ditem=${ditem//.down}
-			host=${ditem%%-*}
-			item=${ditem#*-}
+			host=${ditem%%.*}
+			item=${ditem#*.}
 		
-			if [[ $ditem == *"-"* ]] && [ "${NM_SERVICES[${item}]}" != "" ]; then
+			if [[ $ditem == *"."* ]] && [ "${NM_SERVICES[${item}]}" != "" ]; then
 				itemname=${NM_SERVICES[${ditem#*-}]}
-			elif [[ $ditem == *"-"* ]] && [ "${NM_DOCKERS[${item}]}" != "" ]; then
+			elif [[ $ditem == *"."* ]] && [ "${NM_DOCKERS[${item}]}" != "" ]; then
 				itemname="${NM_DOCKERS[${ditem#*-}]} (docker)"
-			elif [[ $ditem == *"-"* ]] && [ "${REPL_DESC[${item}]}" != "" ]; then
+			elif [[ $ditem == *"."* ]] && [ "${REPL_DESC[${item}]}" != "" ]; then
 				itemname="${REPL_DESC[${item}]} (replication)"
 			else
 				itemname='HOST DOWN';