From 6a8fe4ef02d902b7f833789e41eaf50435c42d44 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 1 Jan 2024 16:27:06 -0600
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index 8fe21266..e8bb3dd6 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -69,10 +69,10 @@ STATUS(){
 		
 		[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : "
 		for NTYPE in "${ntypesel[@]}"; do
-			until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.inprocess 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
+			until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
 				tmp=tmp
 			done
-			STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null &
+			STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.results 2>/dev/null &
 		done
 		[ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"			
 		
@@ -156,7 +156,7 @@ STATUS(){
 			for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do
 				NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}")
 				if [ "${NTS}" != "*" ]; then
-					nodestatus=$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.running)
+					nodestatus=$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.results)
 					[ "${nodestatus}" != "" ] && echo -e "${nodestatus}"
 					rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.done
 					((nc_count++))
@@ -181,7 +181,7 @@ STATUS(){
 		# 	until [ "${completed}" == "true" ]; do
 		# 		if [ -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done ]; then
 		# 			completed=true
-		# 			echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running)"
+		# 			echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.results)"
 		# 		fi
 		# 	done
 		# done
@@ -436,7 +436,7 @@ STATUS_NODE(){
 	dockers=${NODETYPE}_DOCKERS_CHECK[@]
 	hosts=${NODETYPE}_HOSTS[@]
 	NTHOSTS=${NODETYPE}_HOSTS[@]
-	touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess
+	touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running
 		
 	if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then
 		GOFORCHECK=false;
@@ -767,8 +767,7 @@ STATUS_NODE(){
 		done
 		
 	fi #GOFORCHECK
-	rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess
-	touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done
+	mv ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done
 		
 }