voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2024-11-29 15:43:56 -06:00
parent 9e085747ce
commit 783145a600
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.3.6-11292024' VERS='5.3.7-11292024'
NM_BETA=false 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 ' 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 '

3
inc/status.inc
View File

@@ -248,8 +248,9 @@ STATUS(){
checked=skip checked=skip
fi fi
if [ $(($(date +%s)-scanstart)) -gt 600 ]; then 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 touch ${NM_TMPFOLDER}/.replcheck.fail
mv ${STATUSRUN_TMPFOLDER} ${STATUSRUN_TMPFOLDER}.stuck
killall bash killall bash
exit 1 exit 1
fi fi

2
nodemgmt-scripts.sh
View File

@@ -1299,7 +1299,7 @@ GUI(){
else else
if [ ! -f ${NM_TMPFOLDER}/.statusclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.statusclean)) -ge 900 ]; then 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 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 done
touch ${NM_TMPFOLDER}/.statusclean touch ${NM_TMPFOLDER}/.statusclean
fi fi