From d1d7d5ac25625a3d2243cd9c0b2f399bcabf2a98 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 8 Nov 2023 09:16:32 -0600 Subject: [PATCH] Update offsite-power-check.sh --- offsite-power-check.sh | 58 ++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/offsite-power-check.sh b/offsite-power-check.sh index ae25b8bb..144e2d38 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -136,41 +136,38 @@ PWO_RESTART() { } -LOGROTATE(){ - 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} - # mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null - [ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE} - [ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER} - backupstokeep=$(ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort | tail -12) - IFS=$'\n' - read -rd '' -a backupstokeep <<<"${backupstokeep}" - unset IFS - for folder in $(ls -d ${PW_LOGARCHIVE}/* | sort -r); do - keep=0 - for filetokeep in ${backupstokeep[@]}; do - echo "$folder $filetokeep" - if [ "${folder}" == "${filetokeep}" ]; then - keep=1; break - fi - done; - [ ${keep} == 0 ] && rm -Rf ${folder} - done -} +# LOGROTATE(){ +# 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} +# # mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null +# [ ! -f ${PW_LOGFILE} ] && touch ${PW_LOGFILE} +# [ ! -f ${PW_LOGPOWER} ] && touch ${PW_LOGPOWER} +# 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 +# echo "$folder $filetokeep" +# if [ "${folder}" == "${filetokeep}" ]; then +# keep=1; break +# fi +# done; +# [ ${keep} == 0 ] && rm -Rf ${folder} +# done +# } case $1 in start) PWO_START &;; stop) PWO_STOP;; restart) PWO_RESTART;; - logrotate) LOGROTATE;; + # logrotate) LOGROTATE;; update) cd ${PW_FOLDER} if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then @@ -180,7 +177,6 @@ case $1 in git repack -ad >/dev/null 2>&1 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 - # /bin/chmod +x /opt/idssys/powerwall/offsite-power-check.sh 2>&1 /opt/idssys/powerwall/offsite-power-check.sh restart & fi ;;