From c1a6ad0a3681328704743bb4a3508cc88d594ff9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 1 May 2014 00:31:43 +0100 Subject: [PATCH] Make rerendering of low zoom tiles on a style change more robust --- .../tile/templates/default/update-lowzoom.erb | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb index a9a55cb48..946aa2996 100644 --- a/cookbooks/tile/templates/default/update-lowzoom.erb +++ b/cookbooks/tile/templates/default/update-lowzoom.erb @@ -5,15 +5,24 @@ # Send output to the log exec > /var/log/tile/update-lowzoom-<%= @style %>.log 2>&1 -# 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_tiles +{ + render_old \ + --timestamp=$(stat -c %Y "/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml") \ + --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 +} + +# Loop running the update command until it suceeds +until update_tiles +do + sleep 30 +done # Update timestamp for style "<%= @style %>" touch \ -- 2.43.2