Don't error if a temp file vanishes before we can remove it

[chef.git] / cookbooks / tile / templates / default / tile.conf.erb

diff --git a/cookbooks/tile/templates/default/tile.conf.erb b/cookbooks/tile/templates/default/tile.conf.erb
index 9748774c2eb9363b1e681326dcb792f570a06782..f9fe48c960705ac6b9b07822fe1b137a5d137d57 100644 (file)
--- a/cookbooks/tile/templates/default/tile.conf.erb
+++ b/cookbooks/tile/templates/default/tile.conf.erb
@@ -7,13 +7,16 @@ ModTileRenderdSocketName /var/run/renderd/renderd.sock
 ModTileTileDir /srv/tile.openstreetmap.org/tiles
 
 # Time to wait for a re-render before serving a dirty tile
-ModTileRequestTimeout 3
+ModTileRequestTimeout 2
+
+# Timeout before giving up for a tile to be rendered that is otherwise missing
+ModTileMissingRequestTimeout 10
 
 # Don't try and re-render dirty tiles if the load is higher than this
 ModTileMaxLoadOld 36
 
 # Don't try and render missing tiles if the load is higher than this
-ModTileMaxLoadOld 72
+ModTileMaxLoadMissing 72
 
 # Maximum expiry to set on a tile
 ModTileCacheDurationMax 604800