X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8b2c27656d2827c725673084ec95c8ca0b01b6d1..18db4c72edea0d2cd4df5b7d7d9011df618d0ff9:/cookbooks/tile/templates/default/update-lowzoom.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb index a3d2ee291..0455493d9 100644 --- a/cookbooks/tile/templates/default/update-lowzoom.erb +++ b/cookbooks/tile/templates/default/update-lowzoom.erb @@ -5,28 +5,28 @@ # Send output to the log exec > /var/log/tile/update-lowzoom-<%= @style %>.log 2>&1 -# Update tiles from z0 to z10 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="<%= @style %>" \ - --max-load=70 \ - --min-zoom=0 --max-zoom=10 +# 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=<%= @threads %> \ + --map="<%= @style %>" \ + --max-load=<%= node.cpu_cores - 1 %> \ + --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 \ - --reference="/srv/tile.openstreetmap.org/styles/<%= @style %>/project.mml" \ + --reference="/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml" \ "/srv/tile.openstreetmap.org/tiles/<%= @style %>/planet-import-complete" -# Update tiles from z11 to z12 for style "<%= @style %>" -render_old \ - --tile-dir=/srv/tile.openstreetmap.org/tiles \ - --socket=/var/run/renderd/renderd.sock \ - --num-threads=<%= ( node[:cpu][:total] - 2 ) / 4 %> \ - --map="<%= @style %>" \ - --max-load=70 \ - --min-zoom=11 --max-zoom=12 - exit 0