X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba17fa1c38b58aafdc32e0859ba4fda12502d8ec..0d8030b3a7ec9eaa6bc96c7dd39d835a00a7ace0:/cookbooks/tile/templates/default/render-lowzoom.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb index 7fa639185..55a98a754 100644 --- a/cookbooks/tile/templates/default/render-lowzoom.erb +++ b/cookbooks/tile/templates/default/render-lowzoom.erb @@ -3,24 +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 -# Find project file for style "<%= name %>" -project="/srv/tile.openstreetmap.org/styles/<%= name %>/project.mml" +# Get current time +timestamp=$(date +%s) +<% node[:tile][:styles].each_key do |style| -%> -# Update low zoom tiles for style "<%= name %>" -render_old \ - --config=/etc/renderd.conf \ - --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 +# 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 +} -# Update timestamp for style "<%= name %>" -touch --reference="$project" "/srv/tile.openstreetmap.org/tiles/<%= name %>/planet-import-complete" +# Loop running the update command until it suceeds +until update_<%= style %> +do + sleep 30 +done <% end -%> exit 0