diff --git a/roles/web-data-analysis/files/condense-getfedoralogs.sh b/roles/web-data-analysis/files/condense-getfedoralogs.sh index 67be31cfd9..70eb9f1008 100644 --- a/roles/web-data-analysis/files/condense-getfedoralogs.sh +++ b/roles/web-data-analysis/files/condense-getfedoralogs.sh @@ -55,6 +55,13 @@ LBIN=/usr/local/bin/ LSHARE=/usr/local/share/web-data-analysis mkdir -p ${WORKDIR}/${YEAR}/${MONTH} +if [[ ! -f ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ]]; then + touch ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} +fi + +if [[ ! -f ${WORKDIR}/out-${YEAR} ]]; then + touch ${WORKDIR}/out-${YEAR} +fi if [[ ! -f ${LOGFILE} ]]; then echo "No logfile found for ${YEAR}/${MONTH}/${DAY}. Please fix." @@ -71,7 +78,7 @@ fi # file. Doing a continual sort clears up that. sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 4G -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE} -sort -o ${WORKDIR}/out-${YEAR} -S 4G -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} +sort -o ${WORKDIR}/out-${YEAR} -S 4G -u -m ${WORKDIR}/out-${YEAR} ${WORKFILE} # Because the logs stop at 04:00 we can only get 24 hours from 6 days before. egrep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day diff --git a/roles/web-data-analysis/files/condense-mirrorlogs.sh b/roles/web-data-analysis/files/condense-mirrorlogs.sh index 05356c751e..2dec40aa45 100644 --- a/roles/web-data-analysis/files/condense-mirrorlogs.sh +++ b/roles/web-data-analysis/files/condense-mirrorlogs.sh @@ -55,6 +55,14 @@ LBIN=/usr/local/bin/ LSHARE=/usr/local/share/web-data-analysis mkdir -p ${WORKDIR}/${YEAR}/${MONTH} +if [[ ! -f ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ]]; then + touch ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} +fi + +if [[ ! -f ${WORKDIR}/out-${YEAR} ]]; then + touch ${WORKDIR}/out-${YEAR} +fi + if [[ ! -f ${LOGFILE} ]]; then echo "No logfile found for ${YEAR}/${MONTH}/${DAY}. Please fix." @@ -70,7 +78,7 @@ fi # file. Doing a continual sort clears up that. sort -o ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} -S 4G -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} ${WORKFILE} -sort -o ${WORKDIR}/out-${YEAR} -S 4G -u -m ${WORKDIR}/${YEAR}/out-${YEAR}-${MONTH} +sort -o ${WORKDIR}/out-${YEAR} -S 4G -u -m ${WORKDIR}/out-${YEAR} ${WORKFILE} # Because the logs stop at 04:00 we can only get 24 hours from 6 days before. egrep "${OLDDATE}" ${WORKDIR}/out-${OLDYEAR} > ${TEMPDIR}/watched-day