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

update

Browse Source
This commit is contained in:
David Schroeder
2024-01-01 16:23:41 -06:00
parent bf2e8f3e67
commit b80f1b7b56
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.46-12292023' VERS='5.1.48a-01012024'
NM_BETA=false NM_BETA=true
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 '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

8
inc/status.inc
View File

@@ -2,6 +2,7 @@
STATUS(){ STATUS(){
start=$(date +%s) start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S") log_start=$(date "+%Y-%m-%d %H:%M:%S")
SCAN_THREADS=1
if [ "${1}" != "" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then if [ "${1}" != "" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then
ntss=${1^^} ntss=${1^^}
@@ -68,6 +69,9 @@ STATUS(){
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : " [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]}Starting processes to collect node service & docker info : "
for NTYPE in "${ntypesel[@]}"; do for NTYPE in "${ntypesel[@]}"; do
until [ $(ls ${STATUSRUN_TMPFOLDER}/status-check.*.inprocess 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
tmp=tmp
done
STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null & STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running 2>/dev/null &
done done
[ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
@@ -431,8 +435,8 @@ STATUS_NODE(){
NODETYPE=${1} NODETYPE=${1}
dockers=${NODETYPE}_DOCKERS_CHECK[@] dockers=${NODETYPE}_DOCKERS_CHECK[@]
hosts=${NODETYPE}_HOSTS[@] hosts=${NODETYPE}_HOSTS[@]
NTHOSTS=${NODETYPE}_HOSTS[@] NTHOSTS=${NODETYPE}_HOSTS[@]
touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess
if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then
GOFORCHECK=false; GOFORCHECK=false;
@@ -763,7 +767,7 @@ STATUS_NODE(){
done done
fi #GOFORCHECK fi #GOFORCHECK
rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.inprocess
touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done touch ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done
} }