From f00f11fa1bc1ba13a5953f7ab554c238d5baaca6 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 29 Oct 2019 08:42:59 -0500
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index f1601e3e..f68a2ed4 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -95,7 +95,7 @@ STATUS(){
 							if [ "${ST_ACTION}" != "check" ]; then
 								echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 							fi
-							if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NODE_HOSTNAME}" ${STATUS_CHECK_EMAIL}; fi
+							# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NODE_HOSTNAME}" ${STATUS_CHECK_EMAIL}; fi
 							touch ${FOLDER}/${NODE_HOSTNAME}-${srvc}.down
 						fi
 					fi
@@ -207,7 +207,7 @@ STATUS(){
 									if [ "${ST_ACTION}" != "check" ]; then
 										echo -e "${idsCL[Red]}Not running for $(SHOW_TIME ${toterrtime})${idsCL[Default]}"
 									fi
-									if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+									# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
 									touch ${FOLDER}/${nip}-${srvc}.down
 								fi
 							fi
@@ -233,15 +233,15 @@ STATUS(){
 						if [ ! -f ${FOLDER}/${nip}.errtime ]; then
 							touch ${FOLDER}/${nip}.errtime
 						fi
+						errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.down)
+						if [ $errtime -gt ${RENOTIFY} ] && [ "${STATUS_CHECK_EMAIL}" != "" ]; then
+							echo "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
+						fi
 					fi
 					if [ "${ST_ACTION}" != "check" ]; then
 						toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.errtime)
 						echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip})${idsST[Reset]}${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}"
 					fi
-					errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}.down)
-					if [ $errtime -gt ${RENOTIFY} ] && [ "${STATUS_CHECK_EMAIL}" != "" ]; then
-						echo "${NM_NODETYPES[$NTYPE]}-Node${nid} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}
-					fi
 				fi
 				if [ "${ST_ACTION}" != "check" ]; then echo; fi
 				nid=`expr $nid + 1`