From f569b32977e3defdffceffd5ff28aa5014277acb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Dec 2023 08:54:48 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 29e32a5a..84b5b281 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.43-12282023' +VERS='5.1.44-12292023' 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 52b23c27..3aec38be 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -147,7 +147,7 @@ STATUS(){ ## NODE SERVICE AND DOCKER CHECK ################################### - nc_count=0; completed=false + nc_count=0; completed=false; scanstart=$(date +%s) until [ "${completed}" == "true" ]; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}") @@ -159,7 +159,13 @@ STATUS(){ # echo "${NTS} == ${nc_count} == ${nodestatus}" fi done - [ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true + if [ $(($(date +%s)-scanstart)) -gt 600 ]; then + SENDNOTICE "NMG Scan Stuck" "NMG Status scan has been running for 10mins, klling all bash...." 1 + killall bash + exit 1 + fi + [ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true && break + sleep 1s done