Merge lp:~lifeless/lp-dev-utils/ppr into lp:lp-dev-utils

[Robert Collins]

Various improvements to running the PPR daily script, which is intended to be cronnable. Eliminates local diff for ISD's deployment.

[Robert Collins (lifeless)]

And its all trivial, so self-reviewing.

review: Approve

[lp:~lifeless/lp-dev-utils/ppr]

127. By Robert Collins on 2012-09-11

Improve the PPR daily shell wrapper to need no edits for deployments.

=== modified file 'page-performance-report-daily.sh'
--- page-performance-report-daily.sh	2012-08-09 04:53:16 +0000
+++ page-performance-report-daily.sh	2012-09-11 10:38:22 +0000
@@ -1,10 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 #TZ=UTC # trace logs are still BST - blech
 
-CATEGORY=lpnet
-LOGS_ROOTS="/srv/launchpad.net-logs/production /srv/launchpad.net-logs/edge"
-OUTPUT_ROOT=${HOME}/public_html/ppr/lpnet
+# Set CONFIG_FILE, LOGS_ROOTS, LOG_PATTERN, OUTPUT_ROOT in the environment
+# before running this script, to customise its behaviour.
+
+CONFIG_FILE=${CONFIG_FILE:-'page-performance-report.ini'}
+PPR_SWITCHES=${PPR_SWITCHES:-''}
+LOGS_ROOTS=${LOGS_ROOTS:-"/srv/launchpad.net-logs/production /srv/launchpad.net-logs/edge"}
+LOG_PATTERN=${LOG_PATTERN:-'launchpad-trace\*'}
+OUTPUT_ROOT=${OUTPUT_ROOT:-${HOME}/public_html/ppr/lpnet}
 DAY_FMT="+%Y-%m-%d"
 
 find_logs() {
@@ -19,7 +24,7 @@
 
     find ${LOGS_ROOTS} \
         -maxdepth 2 -type f -newermt "$from - 1 day" $end_mtime_switch \
-        -name launchpad-trace\* \
+        -name ${LOG_PATTERN} \
         | sort | xargs -x
 }
 
@@ -67,8 +72,8 @@
 
     echo Generating report from $from until $until into $dir `date`
 
-    ./page-performance-report.py -v  --top-urls=200 --directory=${dir} \
-        $options $files
+    ./bin/py page-performance-report.py --top-urls=200 --directory=${dir} \
+        $options ${PPR_SWITCHES} $files
 
     # Only do the linking if requested.
     if [ "$link" = "link" ]; then