From 52911d1332648b852a89fb60188aec04e4d42c36 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 1 May 2023 19:27:19 -0500
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index fc7314c9..fcc0737e 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -448,7 +448,6 @@ STATUS(){
 								fi
 								
 								checked=false
-								# replnodestart=`date +%s`
 								until [ "${checked}" = "" ]; do
 									if [ "${PH_CMD}" = "" ]; then
 										ssh -q root@${nip} [[ -f ${REPL_CHECKS[${rcheck}]}/test.repl ]] && checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
@@ -460,13 +459,8 @@ STATUS(){
 										break
 									fi
 								done
-								# replend=`date +%s`
-								# replruntime=$((replend-replstart))
-								# replnoderuntime=$((replend-replnodestart))
-								# replcheckruntime=$((replend-replcheckstart))
-								# rrmsg="$(SHOW_TIME ${replruntime} s) (copy)	$(SHOW_TIME ${replcheckruntime} s) (start)	$(SHOW_TIME ${replnoderuntime} s) (node)"
 								if [ "${timeout}" = "true" ]; then
-									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - ${rrmsg}"
+									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
 									if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 										touch ${FOLDER}/${nip}-${rcheck}.down
 										SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1
@@ -474,15 +468,14 @@ STATUS(){
 									fi
 									# echo "$(date) - TIMEOUT - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
 								else
-									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]} - ${rrmsg}"
+									[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]}"
 									if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
 										rm -f ${FOLDER}/${nip}-${rcheck}.down
 										SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})"
 										echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE}
 									fi
 									# echo "$(date) - SYNCED  - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
-								fi
-				
+								fi				
 							done
 						else
 							if [ "${ST_ACTION}" != "check" ]; then
@@ -660,4 +653,37 @@ STATUS(){
 	end=`date +%s`
 	runtime=$((end-start))
 	echo "runtime: ${runtime}"
+}
+
+
+REPLCHECK(){
+	checked=false
+	until [ "${checked}" == "" ]; do
+		if [ "${PH_CMD}" == "" ]; then
+			ssh -q root@${nip} [[ -f ${REPL_CHECKS[${rcheck}]}/test.repl ]] && checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
+		else
+			ssh -q root@${nip} [[ -f ${REPL_CHECKS[${rcheck}]}/test.repl ]] && checked="`${PH_CMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`"
+		fi
+		if [ "`date +%s`" -gt "${timeout}" ]; then
+			timeout=true
+			break
+		fi
+	done
+	if [ "${timeout}" == "true" ]; then
+		[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]} - ${rrmsg}"
+		if [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
+			touch ${FOLDER}/${nip}-${rcheck}.down
+			SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" 1
+			echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder timeout, it is not syncing" >> ${LOGFILE}
+		fi
+		# echo "$(date) - TIMEOUT - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
+	else
+		[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Good${idsCL[Default]} - ${rrmsg}"
+		if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
+			rm -f ${FOLDER}/${nip}-${rcheck}.down
+			SENDNOTICE "Repl-Timeout-'${NM_NODETYPES[$NTYPE]}-Node${nid}'" "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})"
+			echo "$(date) - ${nip} - ${NM_NODETYPES[$NTYPE]}-Node${nid} - (${REPL_DESC[${rcheck}]}) Replicated folder is back up" >> ${LOGFILE}
+		fi
+		# echo "$(date) - SYNCED  - ${rcheck} -	${rrmsg}" >> ${FOLDER}/log.repl
+	fi
 }
\ No newline at end of file