From 9e0af7d6a76d32cba0306f59697da2427ce01bdc Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 14 Jun 2025 19:30:51 -0500 Subject: [PATCH] Update status.inc --- inc/status.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index a3b3eb9f..4afc0274 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -771,14 +771,17 @@ STATUS_NODE(){ 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]}: " - docker_go=0 - if [ "$(${NCMD} docker inspect -f {{.State.Health.Status}} ${docker} 2>/dev/null)" == "healthy" ]; then - docker_go=1 - elif [ "$(${NCMD} docker inspect -f {{.State.Running}} ${docker})" == "true" ]; then - docker_go=1 - fi + # docker_go=0 + # if [ "$(${NCMD} docker inspect -f {{.State.Health.Status}} ${docker} 2>/dev/null)" == "healthy" ]; then + # docker_go=1 + # elif [ "$(${NCMD} docker inspect -f {{.State.Running}} ${docker})" == "true" ]; then + # docker_go=1 + # fi - if [ ${docker_go} -eq 0 ]; then + docker_go=$(${NCMD} "if [ \"\$(docker inspect -f {{.State.Health.Status}} ${docker} 2>/dev/null)\" == \"healthy\" ] || [ \"\$(docker inspect -f {{.State.Running}} ${docker})\" == \"true\" ]; then echo true; else echo false; fi") + + + if [ "${docker_go}" == "false" ]; then #if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ "${nip}" = "10.2.1.5" ] || [[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])); then if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ]; then