From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Jun 2013 21:50:04 +0000 (+0100)
Subject: Improve logging for tile services
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ba17fa1c38b58aafdc32e0859ba4fda12502d8ec

Improve logging for tile services
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 09eb9f579..cc2f6ea5f 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -318,6 +318,12 @@ end
 #  end
 #end
 
+directory "/var/log/tile" do
+  owner "tile"
+  group "tile"
+  mode 0755
+end
+
 package "osm2pgsql"
 package "osmosis"
 
@@ -355,12 +361,6 @@ directory "/var/lib/replicate" do
   mode 0755
 end
 
-directory "/var/log/replicate" do
-  owner "tile"
-  group "tile"
-  mode 0755
-end
-
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb
index a87dc38b5..7fa639185 100644
--- a/cookbooks/tile/templates/default/render-lowzoom.erb
+++ b/cookbooks/tile/templates/default/render-lowzoom.erb
@@ -2,11 +2,14 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-echo $$ > /var/run/render-lowzoom.pid
+# Send output to the log
+exec > /var/log/tile/renderd-lowzoom.log 2>&1
 <% node[:tile][:styles].each do |name,details| -%>
 
+# Find project file for style "<%= name %>"
 project="/srv/tile.openstreetmap.org/styles/<%= name %>/project.mml"
 
+# Update low zoom tiles for style "<%= name %>"
 render_old \
   --config=/etc/renderd.conf \
   --tile-dir=/srv/tile.openstreetmap.org/tiles \
@@ -16,9 +19,8 @@ render_old \
   --timestamp=$(stat --printf=%Y ${project}) \
   --min-zoom=0 --max-zoom=10
 
+# Update timestamp for style "<%= name %>"
 touch --reference="$project" "/srv/tile.openstreetmap.org/tiles/<%= name %>/planet-import-complete"
 <% end -%>
 
-rm -f /var/run/render-lowzoom.pid
-
 exit 0
diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index 862b6a5e7..f996afb04 100644
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -7,7 +7,7 @@
 # osmosis --read-replication-interval-init
 
 # Send output to the log
-exec > /var/log/replicate/replicate.log 2>&1
+exec > /var/log/tile/replicate.log 2>&1
 
 # Change to the replication state directory
 cd /var/lib/replicate
diff --git a/cookbooks/tile/templates/default/replicate.logrotate.erb b/cookbooks/tile/templates/default/replicate.logrotate.erb
index a2878af92..5b211c791 100644
--- a/cookbooks/tile/templates/default/replicate.logrotate.erb
+++ b/cookbooks/tile/templates/default/replicate.logrotate.erb
@@ -1,6 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-/var/log/replicate/*.log {
+/var/log/tile/replicate.log {
   compress
   delaycompress
   notifempty