diff --git a/defaults.inc b/defaults.inc index a071d3b1..80fff51c 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.46-12292023' -NM_BETA=false +VERS='5.1.48a-01012024' +NM_BETA=true 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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/status.inc b/inc/status.inc index cd8b4783..8fe21266 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -2,6 +2,7 @@ STATUS(){ start=$(date +%s) log_start=$(date "+%Y-%m-%d %H:%M:%S") + SCAN_THREADS=1 if [ "${1}" != "" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then ntss=${1^^} @@ -68,6 +69,9 @@ STATUS(){ [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : " for NTYPE in "${ntypesel[@]}"; do + until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.inprocess 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do + tmp=tmp + done STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null & done [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" @@ -431,8 +435,8 @@ STATUS_NODE(){ NODETYPE=${1} dockers=${NODETYPE}_DOCKERS_CHECK[@] hosts=${NODETYPE}_HOSTS[@] - NTHOSTS=${NODETYPE}_HOSTS[@] + touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then GOFORCHECK=false; @@ -763,7 +767,7 @@ STATUS_NODE(){ done fi #GOFORCHECK - + rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done }