aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-01-14 22:54:01 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2016-01-14 22:54:55 +0200
commit87da8dfbaac883b4631746f2e8422ae4a9913426 (patch)
treee4b1406b932717aa62ba005e37ee858d858cab19
parentcc57924fc8b530803c91f73fdf05144842a602b8 (diff)
downloadweblogs-87da8dfbaac883b4631746f2e8422ae4a9913426.tar.gz
analyse-logs.sh: extract_logs: Remove dated commented out chunk of code.
Change-Id: I1958aeffb483966791000b53aeb5de95a18c25b1
-rwxr-xr-xanalyse-logs.sh31
1 files changed, 2 insertions, 29 deletions
diff --git a/analyse-logs.sh b/analyse-logs.sh
index 42cce7c..c3e1fd5 100755
--- a/analyse-logs.sh
+++ b/analyse-logs.sh
@@ -407,6 +407,8 @@ cleanup ()
extract_logs ()
{
+ # Build a single log file that is not gzipped.
+
# Now in 2014 we can just preprocess all 2012 and 2013 files and save processing time for all 3 web servers
# then just grab all of the 2014 files to process
# *access.log-2014*
@@ -425,35 +427,6 @@ extract_logs ()
zcat $INPUT_PATH/preprocessed*access.log.gz > $WORK_PATH/$PROCESSED_LOG_NAME 2>/dev/null || true
fi
- # make sure there is not an existing access.log file
- # Build a single log file that is not gzipped.
-# cat /dev/null > $WORK_PATH/$TMP_LOG_NAME
-# if [ $WEB_NAME = "www.linaro.org" ] ; then
- # This is becasue the logs were stored differently for part of the year
- # on www.linaro.org
- # zcat the daily files that are stored by date access.log-yyyymmdd on to
- # the tail of the new access.log file.
-# x=`ls $INPUT_PATH/$PROCESSED_LOG_NAME-*.gz | wc -l`
-# if [ x > 0 ] ; then
-# zcat $INPUT_PATH/$PROCESSED_LOG_NAME-*.gz >> $WORK_PATH/$TMP_LOG_NAME
-# if [ $DEBUG -eq $TRUE ] ; then
-# echo "$WEB_NAME making access.log by zcat $INPUT_PATH/$PROCESSED_LOG_NAME-*.gz"
-# fi
-# fi
- # zcat the preprocessed log into the file log, 9 Gig's worth
-# zcat $INPUT_PATH/preprocessed-$PROCESSED_LOG_NAME-*.gz > $WORK_PATH/$PROCESSED_LOG_NAME
- # releases and snapshots are stored with a "slightly" different naming convention
- # releases.linaro.org-access.log-yyyymmdd.gz & snapshots.linaro.org-access.log-yyyymmdd.gz
-# elif [ $WEB_NAME = "releases.linaro.org" ] || [ $WEB_NAME = "snapshots.linaro.org" ] ; then
-# x=`ls $INPUT_PATH/$RAW_LOG_NAME-*.gz | wc -l`
-# if [ x > 0 ] ; then
-# zcat $INPUT_PATH/$RAW_LOG_NAME-*.gz > $WORK_PATH/$TMP_LOG_NAME
-# if [ $DEBUG -eq $TRUE ] ; then
-# echo "$WEB_NAME making access.log by zcat $INPUT_PATH/$RAW_LOG_NAME-*.gz"
-# fi
-# fi
-# fi
-
if [ $DO_REV_DNS_LOOKUP -eq $TRUE ] || [ $DO_GEOIP_LOOKUP -eq $TRUE ] ; then
# If it's www.linaro.org build the DNS database
# This is a tad risky as we could have differnt folks coming directly