diff --git a/defaults.inc b/defaults.inc index 84b5b281..435e2441 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.44-12292023' +VERS='5.1.45-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 3aec38be..13d8601c 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -164,7 +164,10 @@ STATUS(){ killall bash exit 1 fi - [ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true && break + if [ ${nc_count} -eq ${#ntypesel[@]} ]; then + completed=true + break + fi sleep 1s done @@ -218,14 +221,19 @@ STATUS(){ fi - checked="" + checked=""; scanstart=$(date +%s) until [ "${checked}" != "" ]; do if [ -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.good ]; then checked=good elif [ -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.timeout ]; then checked=timeout fi - done + 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 + done if [ "${checked}" == "timeout" ]; then [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" @@ -783,7 +791,10 @@ REPLCHECK(){ else ssh -q root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked="`${PH_CMD} \"ssh -o ConnectTimeout=3 root@${nip} \"cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\"`" fi - [ "`date +%s`" -gt "${timeout}" ] && timeout=true && break + if [ "`date +%s`" -gt "${timeout}" ]; then + timeout=true + break + fi done [ "${timeout}" == "true" ] && touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.timeout || touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.good }