From fe4e2e77214bc6c4881619e4d9b794eebdeed74a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 27 Apr 2023 09:39:31 -0500
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index f45c3029..5e42dbe0 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -200,11 +200,12 @@ STATUS(){
 										mysqlgo=true
 									fi
 									# echo "mysqlgo=${mysqlgo}"
+									
+									echo "H: '${srvctst[$sr]}' - '$nip' - '$srvc' - '${mysqlgo}'"
+									
 									if [ "${srvctst[$sr]}" != "active" ] && [ "${mysqlgo}" != "true" ]; then
 										if [ ! -f ${FOLDER}/${nip}-${srvc}.down ]; then
-												if [ "${ST_ACTION}" != "check" ]; then
-													echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-												fi
+												[ "${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}
@@ -212,14 +213,10 @@ STATUS(){
 										else
 											errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
 											if [ $errtime -gt ${RENOTIFY} ]; then
-												if [ ! -f ${FOLDER}/${nip}-${srvc}.errtime ]; then
-													mv ${FOLDER}/${nip}-${srvc}.down ${FOLDER}/${nip}-${srvc}.errtime
-												fi
+												[ ! -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
-												if [ "${srvc}" = "mysql" ]; then
-													${NCMD} systemctl restart ${srvc}
-												fi
+												[ "${srvc}" = "mysql" ] && ${NCMD} systemctl restart ${srvc}
 											fi
 											[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 										fi