From 783145a6007f37aca249a120d96c4a187ad2959f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Nov 2024 15:43:56 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 3 ++- nodemgmt-scripts.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 99ea6b8d..694a220f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.3.6-11292024' +VERS='5.3.7-11292024' 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 offsite-staticroute-fix ' diff --git a/inc/status.inc b/inc/status.inc index 409392bb..a41fff04 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -248,8 +248,9 @@ STATUS(){ checked=skip fi if [ $(($(date +%s)-scanstart)) -gt 600 ]; then - SENDNOTICE "NMG Scan Stuck" "NMG Status Check has been running for 10mins, klling all bash...." 1 + SENDNOTICE "NMG Scan Stuck" "NMG Status Replication Check has been running for 10mins, klling all bash...." 1 touch ${NM_TMPFOLDER}/.replcheck.fail + mv ${STATUSRUN_TMPFOLDER} ${STATUSRUN_TMPFOLDER}.stuck killall bash exit 1 fi diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 046a4c60..7c75b7db 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1299,7 +1299,7 @@ GUI(){ else if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 900 ]; then for oldstatus_check in ${NM_TMPFOLDER}/status-*; do - [ -d "${oldstatus_check}" ] && rm -Rf ${oldstatus_check} + [[ "${oldstatus_check}" !=~ *".stuck"* ]] && [ $(expr $(date +%s) - $(stat -c %Y ${oldstatus_check})) -ge 60 ] rm -Rf ${oldstatus_check} done touch ${NM_TMPFOLDER}/.statusclean fi