From 116913a8d0bc86758391430be23b48ebe1627531 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 1 Jun 2025 12:42:10 -0500
Subject: [PATCH] update

---
 inc/status.inc      |  2 +-
 nodemgmt-scripts.sh | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index e1301091..7a78ab3a 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -688,7 +688,7 @@ STATUS_NODE(){
 									
 									#########################################
 									############ SERVICE REPAIRS ############
-									if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 120 ]; then
+									if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 120 ] && [ "$(GETSKIP ${nip} host)" == "false" ]; then
 										if [ "${srvc}" == "pihole-FTL" ]; then
 											${SSHCMD} root@${nip} 'pihole -r' & >/dev/null 2>&1
 											touch ${NM_TMPFOLDER}/${nip}~${srvc}.fix
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 4a380ed0..1c48a0c1 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1272,17 +1272,26 @@ LIST_SKIPPED_SERVERS(){
 GETSKIP(){
 	nip="${1}"
 	NCMD="ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}"
-	NODE="${NM_HOSTNAMES[${nip}]} [${nip}]"
-	tmpfile=/tmp/.nodeskipcheck.${NM_HOSTNAMES[${nip}]// /-}
 	
-	c=0; spca=''; spc1=`expr ${cw} - ${#NODE}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
-	echo -en "Checking ${NODE}${spca}" >> ${tmpfile}.running
-	if [ $(CHECK_HOST ${nip}) != false ]; then
-		${NCMD} [ -f ${NM_TMPFOLDER}/.skip ] && echo -e "${idsCL[LightRed]}SKIPPED${idsCL[Default]}" >> ${tmpfile}.running || echo "${idsCL[LightCyan]}NOT Skipped${idsCL[Default]}" >> ${tmpfile}.running
+	if [ "${2}" == "" ]; then
+		NODE="${NM_HOSTNAMES[${nip}]} [${nip}]"
+		tmpfile=/tmp/.nodeskipcheck.${NM_HOSTNAMES[${nip}]// /-}
+	
+		c=0; spca=''; spc1=`expr ${cw} - ${#NODE}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
+		echo -en "Checking ${NODE}${spca}" >> ${tmpfile}.running
+		if [ $(CHECK_HOST ${nip}) != false ]; then
+			${NCMD} [ -f ${NM_TMPFOLDER}/.skip ] && echo -e "${idsCL[LightRed]}SKIPPED${idsCL[Default]}" >> ${tmpfile}.running || echo "${idsCL[LightCyan]}NOT Skipped${idsCL[Default]}" >> ${tmpfile}.running
+		else
+			echo -e "${idsCL[Yellow]}OFFLINE${idsCL[Default]}" >> ${tmpfile}.running
+		fi
+		[ -f ${tmpfile}.running ] && mv ${tmpfile}.running ${tmpfile}.done || touch ${tmpfile}.done
 	else
-		echo -e "${idsCL[Yellow]}OFFLINE${idsCL[Default]}" >> ${tmpfile}.running
+		RESULT=false
+		if [ $(CHECK_HOST ${nip}) != false ]; then
+			${NCMD} [ -f ${NM_TMPFOLDER}/.skip ] && RESULT=true
+		fi
+		echo ${RESULT}
 	fi
-	[ -f ${tmpfile}.running ] && mv ${tmpfile}.running ${tmpfile}.done || touch ${tmpfile}.done
 }
 
 BETACHECK(){