From e77b9826f4f1f1b554a116c16ce8e84f3f3e574e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 6 Dec 2023 21:17:50 -0600
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index b0fc7c01..258fab84 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -64,7 +64,7 @@ STATUS(){
 		for NTYPE in "${ntypesel[@]}"; do
 			STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running &
 		done
-		[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n"			
+		[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"			
 		
 		cpu_usage=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
 		
@@ -102,29 +102,21 @@ STATUS(){
 				
 				if [ "$(systemctl is-active ${srvc})" != "active" ]; then
 					if [ ! -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${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 "${NODE_HOSTNAME}" "${NM_SERVICE_DESC[${srvc}]} is down" 1
 						touch ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down
 						echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE}
 					else
 						errtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down))
 						if [ ${errtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then
-							if [ ! -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ]; then
-								mv ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime
-							fi
+							[ ! -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ] && mv ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime
 							toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime))
-							if [ "${ST_ACTION}" != "check" ]; then
-								echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
-							fi
+							[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 							touch ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down
 						fi
 					fi
 				else
-					if [ "${ST_ACTION}" != "check" ]; then
-						echo -e "${idsCL[LightGreen]}Running${idsCL[Default]}"
-					fi
+					[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Running${idsCL[Default]}"
 					if [ -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down ]; then
 						if [ -f ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime ]; then
 							toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.errtime))
@@ -138,8 +130,6 @@ STATUS(){
 					fi
 				fi
 			done
-			
-			if [ "${ST_ACTION}" != "check" ]; then echo; fi
 		fi
 		
 		###################################
@@ -157,7 +147,7 @@ STATUS(){
 					# echo "${NTS} == ${nc_count} == ${nodestatus}"
 				fi
 			done
-			[ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true || sleep 1s
+			[ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true
 		done