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

---
 defaults.inc        |  2 +-
 inc/status.inc      | 23 +++++++++++++----------
 nodemgmt-scripts.sh |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 6e90b1c9..65a9452f 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='5.1.5-12062023'
+VERS='5.1.6-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 72d99fc1..3c009d86 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -24,7 +24,10 @@ STATUS(){
 		ntypesel=(${NM_NODE_TYPES[@]})
 	fi
 	
-	########################
+	############################
+	## REPLICATION CHECK SETUP
+	############################
+	
 	if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then
 		if [ "${ST_ACTION}" != "check" ]; then
 			echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}"
@@ -269,17 +272,17 @@ It was down for $(SHOW_TIME ${toterrtime})"
 					if [ ! -z ${!var+x} ]; then
 						for rcheck in "${!var}"; do
 							if [ "${PH_CMD}" = "" ]; then
-								rm -f ${NM_FOLDER}/test.repl &
-								rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl &
+								rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
+								rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
 							else
-								${PH_CMD} rm -f ${NM_FOLDER}/test.repl &
-								${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl &
+								${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
+								${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
 							fi
 						done
 					fi
 				fi
 			done
-			rm -f ${NM_FOLDER}/test.repl
+			rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl
 			[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n"
 		fi	
 	fi
@@ -746,9 +749,9 @@ REPLCHECK(){
 	checked=false
 	until [ "${checked}" == "" ]; do
 		if [ "${PH_CMD}" == "" ]; then
-			ssh -q root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl ]] && checked=`ssh -o ConnectTimeout=3 root@${nip} "cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl`
+			ssh -q root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked=`ssh -o ConnectTimeout=3 root@${nip} "cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl`
 		else
-			ssh -q root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl ]] && checked="`${PH_CMD} \"ssh -o ConnectTimeout=3 root@${nip} \"cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl\" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl\"`"
+			ssh -q root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked="`${PH_CMD} \"ssh -o ConnectTimeout=3 root@${nip} \"cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\"`"
 		fi
 		[ "`date +%s`" -gt "${timeout}" ] && timeout=true && break
 	done
@@ -763,9 +766,9 @@ REPLSTART(){
 		var=${NODETYPE}_REPL_CHECK[@]
 		if [ ! -z ${!var+x} ]; then
 			for rcheck in "${!var}"; do
-				${PH_CMD} rm -f ${NM_FOLDER}/test.repl
+				${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl
 				daterun=`date +%Y-%m-%d-%H-%M-%S`
-				${PH_CMD} "echo -e \"Replcation-Test\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl" &
+				${PH_CMD} "echo -e \"Replcation-Test\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" &
 				${PH_CMD} 'find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;' &
 			done
 		fi
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 4de6574e..e4871a45 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -874,14 +874,14 @@ GUI(){
 			if [ "${2}" == "freespace" ]; then
 				STATUS freespace ${3}
 			else
-				status_start=$(date +%Y-%m-%d-%H-%M-%S)
-				STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${status_start}"
+				STATUS_START=$(date +%Y-%m-%d-%H-%M-%S)
+				STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${STATUS_START}"
 				mkdir ${STATUSRUN_TMPFOLDER}
 				touch "${STATUSRUN_TMPFOLDER}/status-check.running"
 				
 				if [ "${2}" == "report" ]; then
-					echo "${status_start} - LOCAL - ${NODE_HOSTNAME} - Starting Status Check" >> ${NM_LOGFILE}
-					echo -e "${status_start} - Starting status check #############################\n" > ${STATUSRUN_TMPFOLDER}/status-check.running
+					echo "${STATUS_START} - LOCAL - ${NODE_HOSTNAME} - Starting Status Check" >> ${NM_LOGFILE}
+					echo -e "${STATUS_START} - Starting status check #############################\n" > ${STATUSRUN_TMPFOLDER}/status-check.running
 					STATUS report ${3} >> ${STATUSRUN_TMPFOLDER}/status-check.running
 					echo -e "\n\n$(date +%Y-%m-%d-%H-%M-%S) - Finished status check #############################\n" >> ${STATUSRUN_TMPFOLDER}/status-check.running
 					echo "$(date +%Y-%m-%d-%H-%M-%S) - LOCAL - ${NODE_HOSTNAME} - Completed Status Check" >> ${NM_LOGFILE}