This commit is contained in:
2025-03-13 20:40:15 -05:00
parent d67238c845
commit 8a15a81ce3
2 changed files with 29 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='2.8.26-03102025' VERS='2.8.27-03132025'
noheader=' update service dailytemp confsync -r -report test ' noheader=' update service dailytemp confsync -r -report test '

View File

@@ -706,33 +706,35 @@ ISCSIALLSHUTDOWN(){
} }
LOGROTATE(){ LOGROTATE(){
STOPALL_SERVICES if [ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]; then
lm=`expr $(date +'%m') - 1` STOPALL_SERVICES
if [ ${lm} = 0 ]; then lm=`expr $(date +'%m') - 1`
lm=12 if [ ${lm} = 0 ]; then
ly=`expr $(date +'%Y') - 1` lm=12
else ly=`expr $(date +'%Y') - 1`
ly=$(date +'%Y') 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 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(){ GET_SNAPSHOTS(){