From 8a15a81ce39ceeca724674d4b515269c90050f2c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 13 Mar 2025 20:40:15 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 54 +++++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/defaults.inc b/defaults.inc index 6f43b3a9..69359623 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.8.26-03102025' +VERS='2.8.27-03132025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/powerwall.sh b/powerwall.sh index 1c454959..c2f5024c 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -706,33 +706,35 @@ ISCSIALLSHUTDOWN(){ } LOGROTATE(){ - STOPALL_SERVICES - lm=`expr $(date +'%m') - 1` - if [ ${lm} = 0 ]; then - lm=12 - ly=`expr $(date +'%Y') - 1` - else - ly=$(date +'%Y') + if [ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]; then + STOPALL_SERVICES + lm=`expr $(date +'%m') - 1` + if [ ${lm} = 0 ]; then + lm=12 + ly=`expr $(date +'%Y') - 1` + else + ly=$(date +'%Y') + fi + [ ${lm} -lt 10 ] && lm="0${lm}" + ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm} + mkdir -p ${ARCHIVEFOLDER} + sleep 5s + mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null + mv ${PW_LOGFOLDER}/*.log ${ARCHIVEFOLDER}/ 2> /dev/null + mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/ 2> /dev/null + # source ${PW_FOLDER}/defaults.inc + STARTALL_SERVICES + backupstokeep=(`ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort | tail -12`) + for folder in $(ls -d ${PW_LOGARCHIVE}/* | sort -r); do + keep=0 + for filetokeep in ${backupstokeep[@]}; do + if [ "${folder}" == "${filetokeep}" ]; then + keep=1; break + fi + done; + [ ${keep} == 0 ] && rm -Rf ${folder} + done fi - [ ${lm} -lt 10 ] && lm="0${lm}" - ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm} - mkdir -p ${ARCHIVEFOLDER} - sleep 5s - mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null - mv ${PW_LOGFOLDER}/*.log ${ARCHIVEFOLDER}/ 2> /dev/null - mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/ 2> /dev/null - # source ${PW_FOLDER}/defaults.inc - STARTALL_SERVICES - backupstokeep=(`ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort | tail -12`) - for folder in $(ls -d ${PW_LOGARCHIVE}/* | sort -r); do - keep=0 - for filetokeep in ${backupstokeep[@]}; do - if [ "${folder}" == "${filetokeep}" ]; then - keep=1; break - fi - done; - [ ${keep} == 0 ] && rm -Rf ${folder} - done } GET_SNAPSHOTS(){