From 3445e76d9abde8409dd1921bff899bcac1fc70e7 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 27 Apr 2023 10:11:47 -0500
Subject: [PATCH] update

---
 defaults.inc        |  2 +-
 nodemgmt-scripts.sh | 29 ++++++++++-------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 44064397..b537b118 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='4.4.18-04262023'
+VERS='4.4.20-04262023'
 
 NODETYPES=PW
 NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,PW
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 6018a6ec..88b15af2 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -105,8 +105,7 @@ STATUS(){
 							toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down)
 						fi
 						SENDNOTICE "${NODE_HOSTNAME}" "${NM_SERVICES[${srvc}]} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
-						rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down
-						rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.errtime
+						rm -f ${FOLDER}/${NODE_HOSTNAME}-${srvc}.*
 						echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICES[${srvc}]} is back up" >> ${LOGFILE}
 						
 					fi
@@ -168,8 +167,7 @@ STATUS(){
 							else
 								toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.down)
 							fi
-							rm -f ${FOLDER}/${nip}.down
-							rm -f ${FOLDER}/${nip}.errtime
+							rm -f ${FOLDER}/${nip}.*
 							SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}-UP" "${NM_NODETYPES[$NTYPE]}-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})"
 						fi
 						
@@ -200,40 +198,33 @@ STATUS(){
 									# echo "mysqlgo=${mysqlgo}"
 									if [ "${srvctst[$sr]}" != "active" ] && [ "${mysqlgo}" != "true" ]; then
 										if [ ! -f ${FOLDER}/${nip}-${srvc}.down ]; then
-												[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-												SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1
-												touch ${FOLDER}/${nip}-${srvc}.down
-												echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE}
-
+											[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
+											SENDNOTICE "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" "${NM_SERVICES[${srvc}]} is down" 1
+											touch ${FOLDER}/${nip}-${srvc}.down
+											echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - ${NM_SERVICES[${srvc}]} is down" >> ${LOGFILE}
 										else
 											errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
 											if [ $errtime -gt ${RENOTIFY} ]; then
 												[ ! -f ${FOLDER}/${nip}-${srvc}.errtime ] && mv ${FOLDER}/${nip}-${srvc}.down ${FOLDER}/${nip}-${srvc}.errtime
 												toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.errtime)
 												touch ${FOLDER}/${nip}-${srvc}.down
-												[ "${srvc}" = "mysql" ] && ${NCMD} systemctl restart ${srvc}
+												# ([ "${srvc}" == "mysql" ] || [ "${srvc}" == "mariadb" ]) && ${NCMD} systemctl restart ${srvc} &
 											fi
 											[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 										fi
 									else
 										[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 										if [ -f ${FOLDER}/${nip}-${srvc}.down ]; then
-											if [ -f ${FOLDER}/${nip}-${srvc}.errtime ]; then
-												toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.errtime)
-											else
-												toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
-											fi
+											[ -f ${FOLDER}/${nip}-${srvc}.errtime ] && toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.errtime) || toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${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 ${FOLDER}/${nip}-${srvc}.down
-											rm -f ${FOLDER}/${nip}-${srvc}.errtime
+											rm -f ${FOLDER}/${nip}-${srvc}.*
 
 										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}.*
 										fi
 									fi
 									[ "${mysqlgo}" = "true" ] && unset mysqlgo