Don't warn when the tile cleanup script can't get a lock

[chef.git] / cookbooks / tile / templates / default / render-lowzoom.erb

diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb
index 7fa639185c4d6be7debcca219497a82c615bdeba..de2a3ddc42f6e0f18aa512a7a3cfbc3c1998f8ed 100644 (file)
--- a/cookbooks/tile/templates/default/render-lowzoom.erb
+++ b/cookbooks/tile/templates/default/render-lowzoom.erb
@@ -3,24 +3,18 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Send output to the log
-exec > /var/log/tile/renderd-lowzoom.log 2>&1
-<% node[:tile][:styles].each do |name,details| -%>
+exec > /var/log/tile/render-lowzoom.log 2>&1
+<% node[:tile][:styles].each_key do |style| -%>
 
-# 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 \
+# Update tiles from z0 to z12 for style "<%= @style %>"
+render_list \
+  --all --force \
   --tile-dir=/srv/tile.openstreetmap.org/tiles \
   --socket=/var/run/renderd/renderd.sock \
   --num-threads=<%= ( node[:cpu][:total] - 2 ) / 4 %> \
-  --map="<%= name %>" \
-  --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"
+  --map="<%= style %>" \
+  --max-load=70 \
+  --min-zoom=0 --max-zoom=12
 <% end -%>
 
 exit 0