From 62069ee3a7378819d9b5a3e1cf81ac10f6f00079 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 13 Jan 2024 22:46:59 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8e0d990e..f55b082b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.74-01112024' +VERS='5.1.75-01132024' 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 d28b11e5..87df8ceb 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -35,6 +35,7 @@ STATUS(){ ############################ # REPLRUN=0 [ "${NM_DISABLE_REPL_CHECK}" != "true" ] && ([ ! -f ${NM_TMPFOLDER}/.replcheck ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replcheck)) -ge $(expr ${NM_REPL_CHECK_TIMEOUT} \* 60) ]) && REPLRUN=1 || REPLRUN=0 + ([ -f ${NM_TMPFOLDER}/.replcheck.fail ] && [ ${REPLRUN} -eq 0 ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replcheck.fail)) -ge 60 ]) && REPLRUN=1 [ ${REPLRUN} -eq 1 ] && touch ${NM_TMPFOLDER}/.replcheck # if [ "${STATUS_ACTION}" == "report" ] || [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "check" ] || [ "${STATUS_ACTION}" == "" ]; then if [ "${STATUS_ACTION}" == "repl" ] || ([ "${STATUS_ACTION}" == "" ] && [ "${ntss}" == "" ]) || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]) || ([ "${ntss}" != "" ] && [ "${NM_REPL_CHECK[${ntss}]}" != "" ] && ([ "${STATUS_ACTION}" == "" ] || [ "${STATUS_ACTION}" == "repl" ])); then @@ -242,7 +243,8 @@ STATUS(){ checked=timeout fi if [ $(($(date +%s)-scanstart)) -gt 600 ]; then - SENDNOTICE "NMG Scan Stuck" "NMG Status scan has been running for 10mins, klling all bash...." 1 + SENDNOTICE "NMG Scan Stuck" "NMG REPL check has been running for 10mins, klling all bash...." 1 + touch ${NM_TMPFOLDER}/.replcheck.fail killall bash exit 1 fi @@ -340,6 +342,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ REPLRUN=2 touch ${NM_TMPFOLDER}/.replclean fi + [ -f ${NM_TMPFOLDER}/.replcheck.fail ] && rm -f ${NM_TMPFOLDER}/.replcheck.fail fi ########################