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-06 19:05:53 -06:00
parent a34ac85f42
commit 60be208262
2 changed files with 25 additions and 31 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.14-12062023' VERS='5.1.15-12062023'
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 '

54
inc/status.inc
View File

@@ -21,8 +21,9 @@ STATUS(){
## REPLICATION CHECK SETUP ## REPLICATION CHECK SETUP
############################ ############################
[ ! -f ${NM_TMPFOLDER}/.replcheck ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replcheck)) -ge 300 ] && REPLRUN=1 || REPLRUN=0
# if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then # if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then
if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ]; then if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ] || [ ${REPLRUN} -eq 1 ]; then
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}"
fi fi
@@ -139,7 +140,7 @@ STATUS(){
######################## ########################
# if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then # if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then
if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ]; then if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ] || [ ${REPLRUN} -eq 1 ]; then
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
echo -e "${idsST[Bold]}"; DIVIDER echo -e "${idsST[Bold]}"; DIVIDER
echo -e "${idsCL[Yellow]} Replication Status Between the Primary and Secondary Nodes${idsCL[Default]}" echo -e "${idsCL[Yellow]} Replication Status Between the Primary and Secondary Nodes${idsCL[Default]}"
@@ -245,35 +246,28 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${
########################## ##########################
# REMOVE REPL CHECK FILES # REMOVE REPL CHECK FILES
########################## ##########################
# if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then [ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]} Cleaning up status checks... ${idsCL[Default]}"
if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ]; then for NTYPE in "${ntypesel[@]}"; do
if [ "${ST_ACTION}" != "check" ]; then PH=${NTYPE}_HOSTS[0]
echo -en "${idsCL[LightCyan]} Cleaning up status checks... ${idsCL[Default]}" if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then
fi PH_CMD="ssh root@${!PH}"
#NHCMD="ssh root@${NM_HOSTS['MYSQL'][0]}" var=${NTYPE}_REPL_CHECK[@]
#LBHCMD="ssh root@${NM_HOSTS['LB'][0]}" if [ ! -z ${!var+x} ]; then
#WHCMD="ssh root@${NM_HOSTS['WEB'][0]}" for rcheck in "${!var}"; do
for NTYPE in "${ntypesel[@]}"; do if [ "${PH_CMD}" = "" ]; then
PH=${NTYPE}_HOSTS[0] rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
PH_CMD="ssh root@${!PH}" else
var=${NTYPE}_REPL_CHECK[@] ${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
if [ ! -z ${!var+x} ]; then ${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
for rcheck in "${!var}"; do fi
if [ "${PH_CMD}" = "" ]; then done
rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
else
${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl &
${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl &
fi
done
fi
fi fi
done fi
rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl done
[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl
fi touch ${NM_TMPFOLDER}/.replcheck
[ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n"
fi fi
######################## ########################