diff --git a/powerwall.sh b/powerwall.sh index 76af5fe8..55f0a4de 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1229,25 +1229,25 @@ HOSTPOWER(){ } LOGROTATE(){ - # STOPALL_SERVICES - # lm=`expr $(date +'%m') - 1` - # if [ $lm = 0 ]; then - # lm=12 - # ly=`expr $(date +'%Y') - 1` - # else - # ly=$(date +'%Y') - # fi - # ARCHIVEFOLDER=${PW_LOGARCHIVE}/${ly}-${lm} - # mkdir -p ${ARCHIVEFOLDER} - # mv ${PW_LOGFOLDER}/log* ${ARCHIVEFOLDER}/ - # mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/ - # # source ${PW_FOLDER}/defaults.inc - # sleep 5s - # STARTALL_SERVICES + 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}/ + mv ${PW_LOGFOLDER}/service.* ${ARCHIVEFOLDER}/ + 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 - echo -en "${folder} = " keep=0 for filetokeep in ${backupstokeep[@]}; do if [ "${folder}" == "${filetokeep}" ]; then @@ -1255,6 +1255,7 @@ LOGROTATE(){ fi done; # [ ${keep} == 0 ] && rm -Rf ${folder} + echo -en "${folder} = " [ ${keep} == 0 ] && echo delete || echo keep done }