From 0b2e306561cbff12ae95ed128c5ad6a91047735e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 7 Apr 2017 12:16:14 +0000 Subject: [PATCH] mirrormanager: adapt statistics script to new logfiles Signed-off-by: Adrian Reber --- .../backend/templates/create_statistics.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/mirrormanager/backend/templates/create_statistics.sh b/roles/mirrormanager/backend/templates/create_statistics.sh index 456ac3103d..16ff660167 100644 --- a/roles/mirrormanager/backend/templates/create_statistics.sh +++ b/roles/mirrormanager/backend/templates/create_statistics.sh @@ -19,20 +19,22 @@ else fi INFILE=${INPUT}-${DATE}.xz -INFILE_CONTAINER1=${CONTAINER1}-${DATE}.xz -INFILE_CONTAINER2=${CONTAINER2}-${DATE}.xz OUTPUT=`mktemp -d` -#trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT +trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT # Fetch compressed log files for s in ${MIRRORLIST_SERVERS}; do ssh $s "( xzcat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz done for s in ${MIRRORLIST_PROXIES}; do - ssh $s "( xzcat $INFILE_CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz - ssh $s "( xzcat $INFILE_CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + ssh $s "( cat $CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + ssh $s "( cat $CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + if [ "$1" == "yesterday" ]; then + ssh $s "( xzcat $CONTAINER1-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + ssh $s "( xzcat $CONTAINER2-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + fi done ${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/