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

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-29 08:54:48 -06:00
parent 5f5bc4cb7f
commit f569b32977
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.43-12282023' VERS='5.1.44-12292023'
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 ' 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 '

10
inc/status.inc
View File

@@ -147,7 +147,7 @@ STATUS(){
## NODE SERVICE AND DOCKER CHECK ## NODE SERVICE AND DOCKER CHECK
################################### ###################################
nc_count=0; completed=false nc_count=0; completed=false; scanstart=$(date +%s)
until [ "${completed}" == "true" ]; do until [ "${completed}" == "true" ]; do
for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do
NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}") NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}")
@@ -159,7 +159,13 @@ STATUS(){
# echo "${NTS} == ${nc_count} == ${nodestatus}" # echo "${NTS} == ${nc_count} == ${nodestatus}"
fi fi
done 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 done