From 96192d4979df3758db4df934e318a0c41a10d832 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 10 Dec 2023 17:52:30 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- offsite-power-check.sh | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/defaults.inc b/defaults.inc index b1982f97..7db83bb4 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.4.12-12102023' +VERS='2.4.14-12102023' noheader=' update service dailytemp ' hc_cw=60 diff --git a/offsite-power-check.sh b/offsite-power-check.sh index df03a001..926bca34 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -162,24 +162,23 @@ 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} - # PWO_STOP - # mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null - # PWO_START + 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} + PWO_STOP + mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ 2> /dev/null + PWO_START i=0 for folder in $(ls -d ${PW_LOGARCHIVE}/* 2> /dev/null | sort -r); do i=`expr ${i} + 1` - echo "$i - ${folder}" - [ ${i} -gt 6 ] && rm -Rf ${folder} + [ ${i} -gt 12 ] && rm -Rf ${folder} done } @@ -197,8 +196,8 @@ case $1 in git repack -ad >/dev/null 2>&1 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 - # echo "Updated, restarting services" - # /opt/idssys/powerwall/offsite-power-check.sh restart & + echo "Updated, restarting services" + /opt/idssys/powerwall/offsite-power-check.sh restart & else echo "No update available" fi