Merge remote-tracking branch 'github/pull/183'

[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 1db85a965f75c0d0f005e9df64233d1a0b7ae92b..55a98a754557af9e2478e0e1c952b6ed4b9f47cb 100644 (file)
--- a/cookbooks/tile/templates/default/render-lowzoom.erb
+++ b/cookbooks/tile/templates/default/render-lowzoom.erb
@@ -4,17 +4,29 @@
 
 # Send output to the log
 exec > /var/log/tile/render-lowzoom.log 2>&1
 
 # Send output to the log
 exec > /var/log/tile/render-lowzoom.log 2>&1

+
+# Get current time
+timestamp=$(date +%s)

 <% node[:tile][:styles].each_key do |style| -%>
 
 <% node[:tile][:styles].each_key do |style| -%>
 

-# 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 ) / 2 %> \
-  --map="<%= style %>" \
-  --max-load=70 \
-  --min-zoom=0 --max-zoom=12
+# Define function to update tiles from z0 to z12 for style "<%= style %>"
+function update_<%= style %>
+{
+  render_old \
+    --timestamp=${timestamp} \
+    --tile-dir=/srv/tile.openstreetmap.org/tiles \
+    --socket=/var/run/renderd/renderd.sock \
+    --num-threads=<%= node[:cpu][:total] - 2 %> \
+    --map="<%= style %>" \
+    --max-load=70 \
+    --min-zoom=0 --max-zoom=12
+}
+
+# Loop running the update command until it suceeds
+until update_<%= style %>
+do
+  sleep 30
+done

 <% end -%>
 
 exit 0
 <% end -%>
 
 exit 0