Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190

This commit is contained in:
Steffen Schaefer committed 2015-12-02 08:18:18 +01:00
commit f54ecd6f29
6 files changed
+79 -15

No files matched your search

+2
View File
@@ -0,0 +1,2 @@
#!/bin/sh
/usr/bin/s3cmd -c /root/.s3cfg sync s3://sapsailing-access-logs/elb-access-logs/ /var/log/old/elb-access-logs/ >/var/log/last-elb-access-logs-sync.out 2>/var/log/last-elb-access-logs-sync.err
+3 -1
View File
@@ -16,6 +16,8 @@ mkdir -p "$STATS"
# A sample line:
# 505Worlds2012.sapsailing.com 66.249.73.53 - - [12/Jan/2014:03:33:11 +0000] "GET /robots.txt HTTP/1.1" 404 238 "-" "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
echo Starting "$0" at `date` on file set "$*"
for i in $*; do
grep -q "^$i\$" $VISITED_FILES
if [ "$?" = "0" ]; then
@@ -50,4 +52,4 @@ for month in `cat $MONTHS`; do
done | tee $STATS/unique-ips-days-useragents-per-event-$month
echo "Wrote per-month results to $STATS/unique-ips-days-useragents-per-event-$month"
done
echo "Done."
echo "Done at `date`."