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-11-29 09:26:48 -06:00
parent 1046ddcf66
commit 862fe17f23
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
inc/status.inc
View File

@@ -576,23 +576,19 @@ STATUS_NODE(){
fi fi
tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]} tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]}
SSCHK=true 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 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 SSCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.* rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
else else
SSCHK=primary SSCHK=primary
fi fi
elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then
SSCHK=false 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 fi
if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
if [ "${NODETYPE}" != "OFW" ]; then if [ "${NODETYPE}" != "OFW" ]; then
@@ -686,18 +682,16 @@ STATUS_NODE(){
fi fi
tmp=${NM_SINGLESRVR_DOCKERS[${NODETYPE}]} tmp=${NM_SINGLESRVR_DOCKERS[${NODETYPE}]}
SDCHK=true 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 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 SDCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
else else
SDCHK=primary SDCHK=primary
fi 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 fi
if [ ${SDCHK} == true ] || [ ${SDCHK} == primary ]; then if [ ${SDCHK} == true ] || [ ${SDCHK} == primary ]; then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: " [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "