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:02:13 -06:00
parent c6a30447e6
commit e3b482a0d6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inc/status.inc
View File

@@ -587,17 +587,16 @@ STATUS_NODE(){
SSCHK=true SSCHK=true
if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
SSCHK=skip SSCHK=skip
rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
elif [[ ${tmp[@]} =~ ${srvc} ]]; then 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}.*
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" ] && [ "${srvc}" == "keepalived" ]); then
# SSCHK=false SSCHK=skip
fi fi
([ "${SSCHK}" == "skip" ] || [ "${SSCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
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
@@ -695,15 +694,16 @@ STATUS_NODE(){
SDCHK=true SDCHK=true
if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then
SDCHK=skip SDCHK=skip
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* elif ([ "${nip}" == "10.2.1.5" ] && [ "${docker}" == "tinytuya-server" ]); then
SDCHK=skip
elif [[ ${tmp[@]} =~ ${docker} ]]; then 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}.*
else else
SDCHK=primary SDCHK=primary
fi fi
fi fi
([ "${SDCHK}" == "skip" ] || [ "${SDCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
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]}: "
@@ -867,7 +867,7 @@ REPLCHECK(){
# if [ -f ${NM_TMPFOLDER}/${nip}.disable ] || [ -f ${NM_TMPFOLDER}/${nip}.down ] || ([[ "${nip}" = "10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || # if [ -f ${NM_TMPFOLDER}/${nip}.disable ] || [ -f ${NM_TMPFOLDER}/${nip}.down ] || ([[ "${nip}" = "10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) ||
# [ "${nip}" == "10.2.1.5" ] && ([ "${rcheck}" == "pw-tmp" ] || [ "${rcheck}" == "tinytuya" ] || [ "${rcheck}" == "uptime" ]) ; then # [ "${nip}" == "10.2.1.5" ] && ([ "${rcheck}" == "pw-tmp" ] || [ "${rcheck}" == "tinytuya" ] || [ "${rcheck}" == "uptime" ]) ; then
if [ -f ${NM_TMPFOLDER}/${nip}.disable ] || [ -f ${NM_TMPFOLDER}/${nip}.down ]; then if [ -f ${NM_TMPFOLDER}/${nip}.disable ] || [ -f ${NM_TMPFOLDER}/${nip}.down ] || ([ "${nip}" == "10.2.1.5" ] && [ "${rcheck}" == "pw-tmp" ]); then
rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running
touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip