From 4ac9b106d99c809e513ecedbb2f2675be15d9be0 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 1 Jun 2025 21:45:28 -0500
Subject: [PATCH] Update dsmon.sh

---
 dsmon.sh | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dsmon.sh b/dsmon.sh
index 007b9bd..712955d 100755
--- a/dsmon.sh
+++ b/dsmon.sh
@@ -133,33 +133,34 @@ CHECK(){
 	#for hostid in "${!host_ip[@]}"; do
 	for hostname in "${hostnames_sort[@]}"; do
 		until [ $(ls /tmp/dscheck.*.running 2>/dev/null | wc -l) -lt 6 ]; do tmp=tmp; done
-		RUN_CHECK ${hostname} > /tmp/dscheck.${hostname}.results 2>/dev/null &
+		# RUN_CHECK ${hostname} > /tmp/dscheck.${hostname}.results 2>/dev/null &
+		RUN_CHECK 
 	done
 	[ "${1}" != "report" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 	
-	nc_count=0; completed=false; scanstart=$(date +%s)
-	until [ "${completed}" == "true" ]; do
-		# until [ $(ls /tmp/dscheck.*.done 2>/dev/null | wc -l) -gt 0 ]; do tmp=tmp; done
-		for host in /tmp/dscheck.*.done; do
-			NTS=$(grep -oP '(?<=dscheck.).*?(?=.done)' <<< "${host}")
-			if [ "${NTS}" != "*" ]; then
-				hoststatus=$(cat /tmp/dscheck.${NTS}.results)
-				[ "${hoststatus}" != "" ] && echo -e "${hoststatus}"
-				rm -f /tmp/dscheck.${NTS}.*
-				((nc_count++))
-			fi
-		done
-		if [ $(($(date +%s)-scanstart)) -gt 300 ]; then
-			SENDNOTICE "DSmon Scan Stuck" "DSmon Check scan has been running for 10mins, klling all bash...." 1
-			killall bash
-			exit 1
-		fi
-		if [ ${nc_count} -eq ${#hostnames_sort[@]} ]; then
-			completed=true
-			break
-		fi
-		sleep 1s
-	done
+	# nc_count=0; completed=false; scanstart=$(date +%s)
+	# until [ "${completed}" == "true" ]; do
+	# 	# until [ $(ls /tmp/dscheck.*.done 2>/dev/null | wc -l) -gt 0 ]; do tmp=tmp; done
+	# 	for host in /tmp/dscheck.*.done; do
+	# 		NTS=$(grep -oP '(?<=dscheck.).*?(?=.done)' <<< "${host}")
+	# 		if [ "${NTS}" != "*" ]; then
+	# 			hoststatus=$(cat /tmp/dscheck.${NTS}.results)
+	# 			[ "${hoststatus}" != "" ] && echo -e "${hoststatus}"
+	# 			rm -f /tmp/dscheck.${NTS}.*
+	# 			((nc_count++))
+	# 		fi
+	# 	done
+	# 	if [ $(($(date +%s)-scanstart)) -gt 300 ]; then
+	# 		SENDNOTICE "DSmon Scan Stuck" "DSmon Check scan has been running for 10mins, klling all bash...." 1
+	# 		killall bash
+	# 		exit 1
+	# 	fi
+	# 	if [ ${nc_count} -eq ${#hostnames_sort[@]} ]; then
+	# 		completed=true
+	# 		break
+	# 	fi
+	# 	sleep 1s
+	# done
 	
 	end=`date +%s`; runtime=$((end-start)); echo -e "\nScript Runtime: ${runtime}"
 	echo