diff --git a/defaults.inc b/defaults.inc index f038e13e..f1d79c4e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.14-12062023' +VERS='5.1.15-12062023' 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 ' diff --git a/inc/status.inc b/inc/status.inc index c8414682..5a7df070 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -21,8 +21,9 @@ STATUS(){ ## 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}" == "repl" ] || [ "${ST_ACTION}" == "all" ]; then + if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ] || [ ${REPLRUN} -eq 1 ]; then if [ "${ST_ACTION}" != "check" ]; then echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}" fi @@ -139,7 +140,7 @@ STATUS(){ ######################## # 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 echo -e "${idsST[Bold]}"; DIVIDER 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 ########################## - # if [ "${ST_ACTION}" == "report" ] || [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "check" ] || [ "${ST_ACTION}" == "" ]; then - if [ "${ST_ACTION}" == "repl" ] || [ "${ST_ACTION}" == "all" ]; then - if [ "${ST_ACTION}" != "check" ]; then - echo -en "${idsCL[LightCyan]} Cleaning up status checks... ${idsCL[Default]}" - fi - #NHCMD="ssh root@${NM_HOSTS['MYSQL'][0]}" - #LBHCMD="ssh root@${NM_HOSTS['LB'][0]}" - #WHCMD="ssh root@${NM_HOSTS['WEB'][0]}" - for NTYPE in "${ntypesel[@]}"; do - PH=${NTYPE}_HOSTS[0] - if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then - PH_CMD="ssh root@${!PH}" - var=${NTYPE}_REPL_CHECK[@] - if [ ! -z ${!var+x} ]; then - for rcheck in "${!var}"; do - if [ "${PH_CMD}" = "" ]; then - 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 + [ "${ST_ACTION}" != "check" ] && echo -en "${idsCL[LightCyan]} Cleaning up status checks... ${idsCL[Default]}" + for NTYPE in "${ntypesel[@]}"; do + PH=${NTYPE}_HOSTS[0] + if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then + PH_CMD="ssh root@${!PH}" + var=${NTYPE}_REPL_CHECK[@] + if [ ! -z ${!var+x} ]; then + for rcheck in "${!var}"; do + if [ "${PH_CMD}" = "" ]; then + 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 - done - rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl - [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" - fi + fi + done + rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl + touch ${NM_TMPFOLDER}/.replcheck + [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" fi ########################