From 8204a17e4a6dca814cb667869d43e305b395d001 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 7 Feb 2019 12:32:19 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 54b49668..7319b9e6 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -50,12 +50,12 @@ STATUS() {
 			spc1=${cw}-${#NM_SERVICES[${srvc}]}
 			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 			echo -en " ${NM_SERVICES[${srvc}]}$spc: "
-			if [ $(pgrep ${srvc} | wc -l) -lt "1" ]; then
-				echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-				touch ${FOLDER}/localhost-${srvc}.down
-			elif [ -f ${FOLDER}/localhost-${srvc}.down ]; then
+			if [ $(pgrep ${srvc} | wc -l) -gt "0" ]; then
 				echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 				rm -f ${FOLDER}/localhost-${srvc}.down
+			else
+				echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
+				touch ${FOLDER}/localhost-${srvc}.down
 			fi
 		done
 		echo
@@ -74,12 +74,12 @@ STATUS() {
 			spc1=${cw}-${#NM_SERVICES[${srvc}]}
 			until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 			echo -en " ${NM_SERVICES[${srvc}]}$spc: "
-			if [ $(${NCMD} pgrep ${srvc} | wc -l) -lt "1" ]; then
-				echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
-				touch ${FOLDER}/${nip}-${srvc}.down
-			elif [ -f ${FOLDER}/${nip}-${srvc}.down ]; then
+			if [ $(${NCMD} pgrep ${srvc} | wc -l) -gt "0" ]; then
 				echo -e "${idsCL[Green]}Running${idsCL[Default]}"
 				rm -f ${FOLDER}/${nip}-${srvc}.down
+			else
+				echo -e "${idsCL[Red]}Not Running${idsCL[Default]}"
+				touch ${FOLDER}/${nip}-${srvc}.down
 			fi
 		done
 		echo
@@ -114,6 +114,7 @@ STATUS() {
 							echo "Timeout occurred in waiting for replication between nodes." | mail -s "Status-Check" ${STATUS_CHECK_EMAIL}
 						fi
 						timeout=true
+						touch ${FOLDER}/${nip}-${rcheck}.down
 						break
 					fi
 				done
@@ -121,6 +122,7 @@ STATUS() {
 					echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Green]}Good${idsCL[Default]}"
+					rm -f ${FOLDER}/${nip}-${rcheck}.down
 				fi
 			done
 			echo