diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 1d89c461..6cbc408e 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -738,15 +738,16 @@ MAINTENANCE_MODE(){ if [ "${1}" ] && [ "${NM_NODETYPES[${1^^}]}" != "" ]; then ntss=${1^^} ntypesel=(${ntss}) - STATUS_ACTION=${2} + MM_ACTION=${2} else ntss="" ntypesel=(${NM_NODE_TYPES[@]}) - [ "${1}" == "sync" ] && STATUS_ACTION=repl || STATUS_ACTION=${1} + MM_ACTION=${1} fi PRI_CW=40 declare -i cw; declare -i spc1; declare -i c + item_number=1 for NODETYPE in "${ntypesel[@]}"; do @@ -755,7 +756,7 @@ MAINTENANCE_MODE(){ NTHOSTS=${NODETYPE}_HOSTS[@] - if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then + if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${MM_ACTION}" == "services" ]); then GOFORCHECK=false; else GOFORCHECK=true; @@ -763,9 +764,9 @@ MAINTENANCE_MODE(){ if [ ${GOFORCHECK} = true ]; then - if [ "${STATUS_ACTION}" != "check" ]; then - echo -e "${idsST[Bold]}"; DIVIDER - if [ "${STATUS_ACTION}" == "dockers" ]; then + if [ "${MM_ACTION}" != "check" ]; then + echo -en "${idsST[Bold]}"; DIVIDER + if [ "${MM_ACTION}" == "dockers" ]; then echo -e "${idsCL[LightYellow]} ${NM_NODETYPES[$NTYPE]}-Node Docker Status${idsCL[Default]}" else echo -e "${idsCL[LightYellow]} ${NM_NODETYPES[$NTYPE]}-Node Service Status${idsCL[Default]}" @@ -780,17 +781,16 @@ MAINTENANCE_MODE(){ ######################## ## SERVICES CHECK ######################## - if [ "${STATUS_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ]; then + if [ "${MM_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ]; then echo -e "${idsCL[Green]} System Service(s) Status${idsCL[Default]}" DIVIDER . green 52 srvcs=${NODETYPE}_SERVICES_CHECK[@]; srvcstotest="$(join_by " " ${!srvcs})" for srvc in "${!srvcs}"; do - c=0; cw=${PRI_CW}; spc='' - spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]} - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " + if [ ${item_number} -lt 10 ]; then isel=" ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi + c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${isel} ${idsCL[White]}${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: " echo -e "${idsCL[LightGreen]}here${idsCL[Default]}" done @@ -800,9 +800,9 @@ MAINTENANCE_MODE(){ ######################## ## DOCKER CHECK ######################## - if [[ -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" != "services" ]; then - if [ "${STATUS_ACTION}" != "check" ]; then - [ "${STATUS_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ] && echo + if [[ -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" != "services" ]; then + if [ "${MM_ACTION}" != "check" ]; then + [ "${MM_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ] && echo echo -e "${idsCL[Green]} Docker Service(s) Status${idsCL[Default]}" DIVIDER . green 52 fi @@ -1021,7 +1021,7 @@ GUI(){ ${NM_SCRIPT} status ${2} ${3} ${4} exit 0 else - [ "${STATUS_ACTION}" != "report" ] && echo -e "${idsCL[LightRed]}Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!${idsCL[Default]}\n" + [ "${MM_ACTION}" != "report" ] && echo -e "${idsCL[LightRed]}Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!${idsCL[Default]}\n" if [ ! -f ${NM_TMPFOLDER}/.overload ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.overload)) -ge 600 ]; then SENDNOTICE "NODEMGMT OVERLOAD" "Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!" 1 touch ${NM_TMPFOLDER}/.overload