From cd5d0f2783251fb7e8abaf76c53e7dc9b524aae6 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Mar 2019 01:05:20 -0500
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index f228f6b8..7ca86ab6 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -166,24 +166,27 @@ STATUS(){
 									SERVICE gitea stop q
 									SET-PERMISSIONS gitea q
 									SERVICE gitea start q
-									if [ "${ST_ACTION}" != "check" ]; then
-										if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then
+									if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then
+										if [ "${ST_ACTION}" != "check" ]; then
 											echo -e "${idsCL[Red]}Not Running - could not fix${idsCL[Default]}"
-											if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} is down. Could not fix." | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
-											touch ${FOLDER}/${nip}-${srvc}.down
-										else
-											echo -e "${idsCL[Red]}Running - FIXED${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
-												if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} is back UP! (!!FIXED!!) It was down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
-												rm -f ${FOLDER}/${nip}-${srvc}.down
-												rm -f ${FOLDER}/${nip}-${srvc}.errtime
-											fi
 										fi
+										if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} is down. Could not fix." | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+										touch ${FOLDER}/${nip}-${srvc}.down
+									else
+										if [ "${ST_ACTION}" != "check" ]; then
+											echo -e "${idsCL[Red]}Running - FIXED${idsCL[Default]}"
+										fi
+										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
+											if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "${NM_SERVICES[${srvc}]} is back UP! (!!FIXED!!) It was down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_NODETYPES[$NTYPE]}-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}; fi
+											rm -f ${FOLDER}/${nip}-${srvc}.down
+											rm -f ${FOLDER}/${nip}-${srvc}.errtime
+										fi
+									fi
 								else
 									
 									if [ "${ST_ACTION}" != "check" ]; then