From bb68b1021391db5fe7a295e75eaebeaa829f2678 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 6 Dec 2023 15:48:54 -0600
Subject: [PATCH] update

---
 defaults.inc   |  2 +-
 inc/status.inc | 43 +++++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 65a9452f..6f47034f 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='5.1.6-12062023'
+VERS='5.1.7-12062023'
 NM_BETA=false
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck '
diff --git a/inc/status.inc b/inc/status.inc
index 3c009d86..0ae8405f 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -209,19 +209,13 @@ STATUS(){
 									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
 									if [ ! -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ]; then
 										touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down
-									elif [ ! -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime ]; then
-										mv ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime
-										touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down
-										SENDNOTICE "Repl-Timeout-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})" 1
-										echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${NM_LOGFILE}
 									else
-										snderrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down))
-										# echo "HERE: $snderrtime"
-										if [ ${snderrtime} -gt ${NM_RENOTIFY_TIMEOUT} ]; then
-											toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime))
+										if ([ -f ${nip}~${rcheck}.repl.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.sent)) -gt ${NM_RENOTIFY_TIMEOUT} ]) || ([ ! -f ${nip}~${rcheck}.repl.sent ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down)) -gt 60 ]); then
+											[ ! -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime ] && mv ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime
+											echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${NM_LOGFILE}
 											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
-											echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder timeout, has now been down for: $(SHOW_TIME ${toterrtime})" >> ${NM_LOGFILE}
+It has been down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime)))" 1
+											touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.sent
 											touch ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down
 										fi
 									fi
@@ -229,10 +223,9 @@ It has been down for $(SHOW_TIME ${toterrtime})" 1
 								elif [ "${checked}" == "good" ]; then
 									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Good${idsCL[Default]}"
 									if [ -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.down ]; then
-										if [ -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime ]; then
-											toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime))
+										if [ -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.sent ]; then
 											SENDNOTICE "Repl-'${NM_HOSTNAMES[${nip}]}[${nip}]'" "Replicated folder is back up!\n${NM_REPL_DESC[${rcheck}]} (${NM_REPL_CHECK_LOC[${rcheck}]})
-It was down for $(SHOW_TIME ${toterrtime})"
+It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${rcheck}.repl.errtime)))"
 											echo "$(date +%Y-%m-%d-%H-%M-%S) - ${nip} - ${NM_HOSTNAMES[${nip}]}[${nip}] - (${NM_REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${NM_LOGFILE}
 										fi
 										rm -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl*
@@ -401,7 +394,6 @@ It was down for $(SHOW_TIME ${toterrtime})"
 		fi
 	fi
 	########################
-	########################
 	if [ "${ST_ACTION}" != "check" ]; then
 		echo 
 		if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
@@ -420,7 +412,7 @@ STATUS_NODE(){
 	dockers=${NODETYPE}_DOCKERS_CHECK[@]
 	hosts=${NODETYPE}_HOSTS[@]
 	
-	var=${NODETYPE}_HOSTS[@]
+	NTHOSTS=${NODETYPE}_HOSTS[@]
 		
 	if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${ST_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${ST_ACTION}" == "services" ]); then
 		GOFORCHECK=false;
@@ -439,7 +431,7 @@ STATUS_NODE(){
 			fi
 			DIVIDER . lightYellow; echo -e "${idsST[Reset]}"
 		fi
-		for nip in "${!var}"; do
+		for nip in "${!NTHOSTS}"; do
 			if [ "${ST_ACTION}" != "check" ]; then
 				echo -en " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[Default]}"
 				[ "${ST_ACTION}" != "report" ] && echo -en " - Verifying Host..."
@@ -571,7 +563,13 @@ STATUS_NODE(){
 									fi
 
 								fi
-								# [[ "${NM_SINGLESRVR_SERVICES[${NODETYPE}]}" = *"${srvc}"* ]] && rm -f ${NM_TMPFOLDER}/*~${srvc}.* || rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+								if [[ "${NM_SINGLESRVR_SERVICES[${NODETYPE}]}" = *"${srvc}"* ]]; then
+									for tnip in "${!NTHOSTS}"; do
+										rm -f ${NM_TMPFOLDER}/${tnip}~${srvc}.* &
+									done
+								else
+									rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.* &
+								fi
 							fi
 							[ "${mysqlgo}" = "true" ] && unset mysqlgo
 							[ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
@@ -664,8 +662,13 @@ STATUS_NODE(){
 								if [ "${ST_ACTION}" != "check" ]; then
 									echo -en "${idsCL[LightGreen]}Running"
 								fi
-								# if [ "${docker}" == "authelia" ] || [ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ]; then
-								[[ "${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}" = *"${docker}"* ]] && rm -f ${NM_TMPFOLDER}/*~{docker}.* || rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
+								if [[ "${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}" = *"${docker}"* ]]; then
+									for tnip in "${!NTHOSTS}"; do
+										rm -f ${NM_TMPFOLDER}/${tnip}~${docker}.* &
+									done
+								else
+									rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* &
+								fi
 							fi
 							[ "${SDCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
 						else