From 862fe17f23b44117aee23638cf47bc6249ed26c4 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 29 Nov 2024 09:26:48 -0600
Subject: [PATCH] Update status.inc

---
 inc/status.inc | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/inc/status.inc b/inc/status.inc
index f1500a81..e0413850 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -576,23 +576,19 @@ STATUS_NODE(){
 						fi
 						tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]}
 						SSCHK=true
-						if [[ ${tmp[@]} =~ ${srvc} ]]; then
+						if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
+							SSCHK=skip
+							rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
+						elif [[ ${tmp[@]} =~ ${srvc} ]]; then
 							if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then
 								SSCHK=false
 								rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
 							else
 								SSCHK=primary
 							fi
-							
 						elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then
 							SSCHK=false
-							
-						elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
-							SSCHK=skip
-							rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
-							
 						fi
-												
 						if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then
 							[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
 							if [ "${NODETYPE}" != "OFW" ]; then
@@ -686,18 +682,16 @@ STATUS_NODE(){
 						fi
 						tmp=${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}
 						SDCHK=true
-						if [[ ${tmp[@]} =~ ${docker} ]]; then
+						if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
+							SDCHK=skip
+							rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
+						elif [[ ${tmp[@]} =~ ${docker} ]]; then
 							if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then
 								SDCHK=false
 								rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 							else
 								SDCHK=primary
 							fi
-							
-						elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
-							SDCHK=skip
-							rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
-							
 						fi
 						if [ ${SDCHK} == true ] || [ ${SDCHK} == primary ]; then
 							[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "