From a9f8bf48db2685e2c182a910a0aef034771e2818 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 3 Oct 2023 11:09:53 -0500
Subject: [PATCH] update

---
 defaults.inc   |  2 +-
 inc/status.inc | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index cb98ff62..281229b1 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -9,7 +9,7 @@ NM_TMPFOLDER=${NM_FOLDER}/.tmp
 NM_LOGFOLDER=${NM_FOLDER}/logs
 NM_LOGFILE=${NM_LOGFOLDER}/logfile
 
-RENOTIFY=3600
+RENOTIFY_TIMEOUT=3600
 
 [ ! -d ${NM_TMPFOLDER} ] && mkdir ${NM_TMPFOLDER}
 [ ! -d ${NM_LOGFOLDER} ] && mkdir ${NM_LOGFOLDER}
diff --git a/inc/status.inc b/inc/status.inc
index c2f89aed..2916c0d2 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -82,7 +82,7 @@ STATUS(){
 						echo "$(date) - LOCAL - ${NODE_HOSTNAME} - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE}
 					else
 						errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${NODE_HOSTNAME}~${srvc}.down)
-						if [ $errtime -gt ${RENOTIFY} ]; then
+						if [ $errtime -gt ${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
@@ -206,7 +206,7 @@ STATUS(){
 											echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_SERVICE_DESC[${srvc}]} is down" >> ${NM_LOGFILE}
 										else
 											errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)
-											if [ $errtime -gt ${RENOTIFY} ]; then
+											if [ $errtime -gt ${RENOTIFY_TIMEOUT} ]; then
 												[ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${srvc}.down ${NM_TMPFOLDER}/${nip}~${srvc}.errtime
 												toterrtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.errtime)
 												touch ${NM_TMPFOLDER}/${nip}~${srvc}.down
@@ -279,7 +279,7 @@ STATUS(){
 							#
 							# 			else
 							# 				errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)
-							# 				if [ $errtime -gt ${RENOTIFY} ]; then
+							# 				if [ $errtime -gt ${RENOTIFY_TIMEOUT} ]; then
 							# 					if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.errtime ]; then
 							# 						mv ${NM_TMPFOLDER}/${nip}~${srvc}.down ${NM_TMPFOLDER}/${nip}~${srvc}.errtime
 							# 					fi
@@ -378,7 +378,7 @@ STATUS(){
 													echo "$(date) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - ${NM_DOCKER_DESC[${docker}]} (docker) is down, could not fix" >> ${NM_LOGFILE}
 												else
 													errtime=`date +%s`-$(stat -c %Y ${NM_TMPFOLDER}/${nip}~${docker}.down)
-													if [ $errtime -gt ${RENOTIFY} ]; then
+													if [ $errtime -gt ${RENOTIFY_TIMEOUT} ]; then
 														if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.errtime ]; then
 															mv ${NM_TMPFOLDER}/${nip}~${docker}.down ${NM_TMPFOLDER}/${nip}~${docker}.errtime
 														fi
@@ -420,13 +420,13 @@ STATUS(){
 							if [ "${ST_ACTION}" != "check" ]; then
 								echo -e "${idsCL[Red]} - Node has been down for $(SHOW_TIME ${toterrtime}) ${idsCL[LightYello]}${LH}${idsCL[Default]}"
 							fi
-							if [ $errtime -gt ${RENOTIFY} ]; then
+							if [ $errtime -gt ${RENOTIFY_TIMEOUT} ]; then
 								touch ${NM_TMPFOLDER}/${nip}.down
 								SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" 1
 							elif [ $errtime -gt 60 ] && [ $errtime -lt 180 ] && [ ! -f ${NM_TMPFOLDER}/${nip}.errtime ]; then
 								SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "${NM_HOSTNAMES[${nip}]}[${nip}] is down" 1
 							fi
-							# if [ $errtime -gt ${RENOTIFY} ] && [ "${EMAIL_NOTICE}" != "" ]; then
+							# if [ $errtime -gt ${RENOTIFY_TIMEOUT} ] && [ "${EMAIL_NOTICE}" != "" ]; then
 							# 	echo "${NM_HOSTNAMES[${nip}]}[${nip}] has been down for $(SHOW_TIME ${toterrtime})" | mail -s "${NM_HOSTNAMES[${nip}]}[${nip}]" ${EMAIL_NOTICE}
 							# fi
 						fi
@@ -518,7 +518,7 @@ STATUS(){
 									else
 										snderrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down)`
 										# echo "HERE: $snderrtime"
-										if [ ${snderrtime} -gt ${RENOTIFY} ]; then
+										if [ ${snderrtime} -gt ${RENOTIFY_TIMEOUT} ]; then
 											toterrtime=`expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime)`
 											SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})
 It has been down for $(SHOW_TIME ${toterrtime})" 1