From f8611de79f8a9fb3435e4d0cc2a5f28064251afa Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 20 Nov 2024 22:49:04 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index b1a1899e..f3fe444a 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -582,7 +582,7 @@ STATUS_NODE(){ else SSCHK=primary fi - elif ([ "${nip}" == "10.2.1.51" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then + elif ([ "${nip}" == "10.2.1.5" ] || [ "${nip}" == "10.2.1.240" ]) && [ "${srvc}" == "keepalived" ]; then SSCHK=false else SSCHK=true @@ -839,10 +839,11 @@ REPLCHECK(){ timeout=`date --date='1 minutes' +%s` # timeout=`date --date='30 seconds' +%s` - if [ -f ${NM_TMPFOLDER}/${nip}.disable ] || [ -f ${NM_TMPFOLDER}/${nip}.down ] || ([[ "${nip}" = "10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]); then - # if [ "${nip}" == "10.2.1.5xxx" ] && ([ "${rcheck}" == "pdns" ] || [ "${rcheck}" == "pdnsadmin" ]); then - rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running - touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip + 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 + rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running + touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip + else checked=false until [ "${checked}" == "" ]; do