From 56b13d53b72b18ac63e0d1f70c9e97324ece22fd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 9 Feb 2024 13:42:49 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 1b8a2bb1..595fdfc4 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.86-02092024' +VERS='5.1.87-02092024' 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 c5673ed1..1b6333a4 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -39,6 +39,7 @@ STATUS(){ [ ${REPLRUN} -eq 1 ] && touch ${NM_TMPFOLDER}/.replcheck # if [ "${STATUS_ACTION}" == "report" ] || [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "check" ] || [ "${STATUS_ACTION}" == "" ]; then if [ "${STATUS_ACTION}" == "repl" ] || ([ "${STATUS_ACTION}" == "" ] && [ "${ntss}" == "" ]) || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]) || ([ "${ntss}" != "" ] && [ "${NM_REPL_CHECK[${ntss}]}" != "" ] && ([ "${STATUS_ACTION}" == "" ] || [ "${STATUS_ACTION}" == "repl" ])); then + touch ${NM_TMPFOLDER}/.replcheck if [ "${STATUS_ACTION}" != "check" ]; then MSG="Setting up replication checks" c=0; cw=${LD_CW}; spc=''; spc1=${cw}-${#MSG}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done @@ -318,9 +319,6 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ fi fi done - rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl - touch ${NM_TMPFOLDER}/.replcheck - [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" if [ ! -f ${NM_TMPFOLDER}/.replclean ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.replclean)) -ge 10800 ]; then for NTYPE in "${NM_NODE_TYPES[@]}"; do @@ -343,6 +341,10 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ REPLRUN=2 touch ${NM_TMPFOLDER}/.replclean fi + rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl + [ "${STATUS_ACTION}" != "check" ] && echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" + + touch ${NM_TMPFOLDER}/.replcheck [ -f ${NM_TMPFOLDER}/.replcheck.fail ] && rm -f ${NM_TMPFOLDER}/.replcheck.fail fi