From 3c26dcae65ec8e584416288c6583fef7c7704964 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 9 Feb 2024 10:34:50 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index f836f37a..708b36b7 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.83-02062024' +VERS='5.1.84-02062024' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/inc/status.inc b/inc/status.inc index 411d4225..fc9c906e 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -64,6 +64,7 @@ STATUS(){ if [ ! -f ${NM_FOLDER}/${!PH}.down ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then var2=${NTYPE}_REPL_CHECK[@] for rcheck in "${!var2}"; do + until [ $(ls ${STATUSRUN_TMPFOLDER}/repl.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do tmp=tmp; done REPLCHECK "${rcheck}" "${nip}" "${PH_CMD}" "${STATUS_ACTION}" & >/dev/null 2>&1 done fi @@ -806,6 +807,7 @@ REPLCHECK(){ rcheck=${1} nip=${2} PH_CMD=${3} + touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running # if [ "${4}" != "check" ]; then # timeout=`date --date='1 minutes' +%s` @@ -828,6 +830,7 @@ REPLCHECK(){ break fi done + rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running [ "${timeout}" == "true" ] && touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.timeout || touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.good }