From 1f58a5d00f0feed8cef37c38ea5d9888ec102c6d Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Thu, 2 Jun 2016 17:18:45 +0000
Subject: [PATCH] fix a script to combine dl files

---
 roles/awstats/files/combineHttpLogs.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/roles/awstats/files/combineHttpLogs.sh b/roles/awstats/files/combineHttpLogs.sh
index 0c5bda72d9..b997de9456 100644
--- a/roles/awstats/files/combineHttpLogs.sh
+++ b/roles/awstats/files/combineHttpLogs.sh
@@ -29,20 +29,29 @@ DAY=$(/bin/date -d "-${NUMDAYS} days" +%d)
 
 LOGDIR=/var/log/hosts
 NFSDIR=/mnt/fedora_stats/combined-http
-HTTPLOG=${LOGDIR}/proxy*/${YEAR}/${MONTH}/${DAY}/http/
-
+PROXYLOG=${LOGDIR}/proxy*/${YEAR}/${MONTH}/${DAY}/http/
+DL_LOG=${LOGDIR}/download*/${YEAR}/${MONTH}/${DAY}/http/
 
 TARGET=${NFSDIR}/${YEAR}/${MONTH}/${DAY}
 
 LOGMERGE=/usr/share/awstats/tools/logresolvemerge.pl
 
-FILES=$( ls -1 ${HTTPLOG}/*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
+FILES=$( ls -1 ${PROXYLOG}/*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
 
 mkdir -p ${TARGET}
 
 for FILE in ${FILES}; do
     TEMP=$(echo ${FILE} | sed 's/\.xz$//')
-    perl ${LOGMERGE} ${HTTPLOG}/${FILE} > ${TARGET}/${TEMP}
+    perl ${LOGMERGE} ${PROXYLOG}/${FILE} > ${TARGET}/${TEMP}
+done
+
+FILES=$( ls -1 ${DL_LOG}/dl*access.log.xz | awk '{x=split($0,a,"/"); print a[x]}' | sort -u )
+
+mkdir -p ${TARGET}
+
+for FILE in ${FILES}; do
+    TEMP=$(echo ${FILE} | sed 's/\.xz$//')
+    perl ${LOGMERGE} ${DL_LOG}/${FILE} > ${TARGET}/${TEMP}
 done
 
 # Now we link up the files into latest directory