voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

Update status.inc

Browse Source
This commit is contained in:
David Schroeder
2024-12-01 15:08:21 -06:00
parent e3b482a0d6
commit 51bfc3f1fe
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
inc/status.inc
View File

@@ -594,10 +594,10 @@ STATUS_NODE(){
SSCHK=primary
fi
elif ([ "${nip}" == "10.2.1.51" ] && [ "${srvc}" == "keepalived" ]); then
SSCHK=skip
SSCHK=disable
fi
([ "${SSCHK}" == "skip" ] || [ "${SSCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then
([ "${SSCHK}" == "skip" ] || [ "${SSCHK}" == "false" ] || [ "${SSCHK}" == "disable" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && ([ ${SSCHK} == true ] || [ ${SSCHK} == primary ]); then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
if [ "${NODETYPE}" != "OFW" ]; then
srvctest=${srvctst[$sr]}
@@ -658,7 +658,7 @@ STATUS_NODE(){
[ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
# elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${nip}" != "10.2.1.5" ] && [[ "${nip}" = *"10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || ([ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.51" ]); then
elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ]; then
elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || [ "${SSCHK}" == "disable" ]; then
echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}"
elif [ "${SSCHK}" == "skip" ]; then
@@ -704,7 +704,7 @@ STATUS_NODE(){
fi
fi
([ "${SDCHK}" == "skip" ] || [ "${SDCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
if [ ${SDCHK} == true ] || [ ${SDCHK} == primary ]; then
if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ ${SDCHK} == true ] || [ ${SDCHK} == primary ]); then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then
@@ -775,7 +775,8 @@ STATUS_NODE(){
fi
fi
[ "${SDCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
elif [ -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] || [ "${SDCHK}" == "disable" ]; then
echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}"
elif [ "${SDCHK}" == "skip" ]; then
echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Host Disabled${idsCL[Default]}"
else