Merge pull request #589 from pnorman/tilelog_v1.5.0

Update to tilelog v1.5.0

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 44791c28868e797732ec8d388b62cdbe5573365f..9ab18f93b1159023aaacf00cd7f79a5bdd1aae36 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -31,7 +31,7 @@ end
 python_package "tilelog" do
   python_virtualenv tilelog_directory
   python_version "3"
-  version "1.4.1"
+  version "1.5.0"
 end
 
 directory tilelog_output_directory do

diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 2c8799b1c1fc9c6dd44b85a2a0b90702267f4ad7..5ce9180cc07ebe0283e9fa42f6968aa8402cd2b3 100644 (file)
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -18,10 +18,11 @@ export AWS_REGION="eu-west-1"
 TILEFILE="tiles-${DATE}.txt.xz"
 HOSTFILE="hosts-${DATE}.csv"
 APPFILE="apps-${DATE}.csv"
+COUNTRYFILE="countries-${DATE}.csv"
 
 nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \
-  --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}"
+  --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" --country "${COUNTRYFILE}"
 
-mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${OUTDIR}"
+mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}"
 
 rm -rf "$TMPDIR"