diff --git a/inc/status.inc b/inc/status.inc index e7678c3d..4cbaf86b 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -587,17 +587,16 @@ STATUS_NODE(){ SSCHK=true 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 ([ "${nip}" == "10.2.1.51" ] && [ "${srvc}" == "keepalived" ]); then + SSCHK=skip fi + ([ "${SSCHK}" == "skip" ] || [ "${SSCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.* if [ ${SSCHK} == true ] || [ ${SSCHK} == primary ]; then [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " if [ "${NODETYPE}" != "OFW" ]; then @@ -695,15 +694,16 @@ STATUS_NODE(){ SDCHK=true 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 ([ "${nip}" == "10.2.1.5" ] && [ "${docker}" == "tinytuya-server" ]); then + SDCHK=skip 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 fi + ([ "${SDCHK}" == "skip" ] || [ "${SDCHK}" == "false" ]) && rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* if [ ${SDCHK} == true ] || [ ${SDCHK} == primary ]; then [ "${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 ]) || # [ "${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 touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip