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-05 23:11:36 -06:00
parent 08212ce67f
commit fdbf2f3eff
5 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/services.inc
View File

@@ -332,7 +332,6 @@ SERVICE_MGMT(){
var1=${NTYPE}_SERVICES_CHECK[@]
# if [[ "${!var1}" = *"${SERVICE['service']}"* ]]; then
if [[ " ${!var1} " =~ " ${SERVICE['service']} " ]]; then
nid=1
if [ "${SERVICE['node']}" != "" ]; then
var2=(${SERVICE['node']})
sethost=true;
@@ -415,7 +414,6 @@ SERVICE_MGMT(){
fi
fi
# fi
nid=`expr $nid + 1`
# if [ "${SERVICE['service']}" = "gitea" ]; then
# break
# fi
@@ -465,7 +463,6 @@ CHECK_DOCKER_SERVICES(){
echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Docker Service(s) Status${idsCL[Default]}"
DIVIDER; echo -e "${idsST[Reset]}"
fi
nid=1
for nip in "${!hosts}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then NCMD=''; LH='- localhost'
@@ -535,7 +532,6 @@ CHECK_DOCKER_SERVICES(){
fi
fi
if [ "${ST_ACTION}" != "check" ]; then echo; fi
nid=`expr $nid + 1`
done
fi
done

11
inc/status.inc
View File

@@ -132,7 +132,6 @@ STATUS(){
########################
for NTYPE in "${ntypesel[@]}"; do
nid=1
dockers=${NTYPE}_DOCKERS_CHECK[@]
hosts=${NTYPE}_HOSTS[@]
@@ -451,7 +450,6 @@ STATUS(){
fi
[ "${ST_ACTION}" != "check" ] && echo
nid=`expr $nid + 1`
done
fi #GOFORCHECK
@@ -624,7 +622,6 @@ It was down for $(SHOW_TIME ${toterrtime})"
echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node(s) Free Space Scan${idsCL[Default]}"
DIVIDER; echo -e "${idsST[Reset]}"
fi
nid=1
var=${NTYPE}_HOSTS[@]
for nip in "${!var}"; do
if [[ $"{RNIP}" == *"${nip}"* ]]; then NCMD=''; LH='- localhost'
@@ -721,7 +718,6 @@ It was down for $(SHOW_TIME ${toterrtime})"
# fi
# done
nid=`expr $nid + 1`
echo
done
done
@@ -769,25 +765,24 @@ REPLCHECK(){
}
STATUS_SCANTIMES(){
scandefault=200
while [ $# -gt 0 ]; do
case "${1}" in
-l|-last) LAST=${2};;
-h|-help|--help)
echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] scantimes {opt}${idsCL[Default]} {"
width=15
printf "%-${width}s- %s\n" " -l|-last" "(number of last scantimes to average from, defaults to 480)"
printf "%-${width}s- %s\n" " -l|-last" "(number of last scan times to average from, defaults to ${scandefault})"
echo -e "}\n"
exit 0;;
esac
shift
done
[ "${LAST}" == "" ] && LAST=200
[ "${LAST}" == "" ] && LAST=${scandefault}
echo -en "${idsCL[Yellow]}Pulling data and calculating average scan times for the last '${LAST}' scans ... "
lastscantime=$(tail -n 1 ${NM_LOGFOLDER}/status-check.scantimes)
scantimes=($(tail -n ${LAST} ${NM_LOGFOLDER}/status-check.scantimes))
scantimes_total=0; scansfound=0
for scantime in "${scantimes[@]}"; do

4
inc/status.new.inc
View File

@@ -132,7 +132,6 @@ STATUSNEW(){
########################
for NTYPE in "${ntypesel[@]}"; do
nid=1
dockers=${NTYPE}_DOCKERS_CHECK[@]
hosts=${NTYPE}_HOSTS[@]
@@ -451,7 +450,6 @@ STATUSNEW(){
fi
[ "${ST_ACTION}" != "check" ] && echo
nid=`expr $nid + 1`
done
fi #GOFORCHECK
@@ -624,7 +622,6 @@ It was down for $(SHOW_TIME ${toterrtime})"
echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node(s) Free Space Scan${idsCL[Default]}"
DIVIDER; echo -e "${idsST[Reset]}"
fi
nid=1
var=${NTYPE}_HOSTS[@]
for nip in "${!var}"; do
if [[ $"{RNIP}" == *"${nip}"* ]]; then NCMD=''; LH='- localhost'
@@ -721,7 +718,6 @@ It was down for $(SHOW_TIME ${toterrtime})"
# fi
# done
nid=`expr $nid + 1`
echo
done
done