From 894f8fa5cb84e84fbd4811ed73b508f3003b8158 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 12 Dec 2023 11:30:49 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index 5f7e11ef..9949f20a 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -545,11 +545,15 @@ STATUS_NODE(){ SSCHK=primary fi else - SSCHK=true + if [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then + SSCHK=false + elif [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]); then + SSCHK=false + else + SSCHK=true + fi fi - - [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && SSCHK=false - + if [ ${SSCHK} != false ]; then [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " if [ "${NODETYPE}" != "OFW" ]; then @@ -608,7 +612,7 @@ STATUS_NODE(){ [ "${mysqlgo}" == "true" ] && unset mysqlgo [ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}" - elif [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]); then + elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ])); then echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}" else