X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/29bee86e6f11a38a84541404865a4c04a2bfc189..1a062eb5304d0ef835313e5948053fcdccf20ecf:/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 f4aeb4faf..834eecc30 100644 --- a/cookbooks/tile/templates/default/render-lowzoom.erb +++ b/cookbooks/tile/templates/default/render-lowzoom.erb @@ -3,23 +3,30 @@ # 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 -# Update low zoom tiles for style "<%= name %>" -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 %>" \ - --max-load=70 \ - --min-zoom=0 --max-zoom=12 +# Get current time +timestamp=$(date +%s) +<% node[:tile][:styles].each_key do |style| -%> -# Update timestamp for style "<%= name %>" -touch \ - --reference="/srv/tile.openstreetmap.org/styles/<%= name %>/project.mml" \ - "/srv/tile.openstreetmap.org/tiles/<%= name %>/planet-import-complete" +# 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_cores - 1 %> \ + --map="<%= style %>" \ + --max-load=<%= node.cpu_cores - 1 %> \ + --min-zoom=0 --max-zoom=12 +} + +# Loop running the update command until it suceeds +until update_<%= style %> +do + sleep 30 +done <% end -%> exit 0