imagery: backport nginx caching improvements

[chef.git] / cookbooks / imagery / templates / default / nginx_imagery_layer_fragment.conf.erb

diff --git a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
index 922ec7a9600107a58ec729dba9c140b88d3328fa..f9caaea4de234b72ef3de18dfd56dfa4398805bc 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb
@@ -1,10 +1,10 @@
 # DO NOT EDIT - This file is being maintained by Chef
-
 location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   # Override QUERY_STRING to force mapserver query parameters
   fastcgi_param QUERY_STRING "map=/srv/imagery/mapserver/layer-<%= @layer %>.map&mode=tile&layers=<%= @layer %>&tilemode=gmap&tile=$2+$3+$1";
-  fastcgi_pass "unix:/var/run/mapserver-fastcgi/layer-<%= @site %>.socket";
+  fastcgi_pass "<%= @site %>_fastcgi";
   fastcgi_buffers 8 64k;
+  fastcgi_busy_buffers_size 64k;
   include fastcgi_params;
   fastcgi_param REQUEST_METHOD "GET";
   fastcgi_param HTTP_PROXY "";
@@ -18,16 +18,22 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" {
   fastcgi_keep_conn off;
 
   fastcgi_cache_lock on;
-  fastcgi_cache_lock_timeout 30s;
   fastcgi_cache_valid 200 21d;
-  fastcgi_cache_use_stale error timeout updating http_500 http_503;
 
-  # Leaflet aborts connection still in flight to free up resources
-  fastcgi_ignore_client_abort off;
+  # Serve stale cache on errors or if updating
+  fastcgi_cache_use_stale error timeout updating http_500 http_503 http_504;
+  # If in cache as stale, serve stale and update in background
+  fastcgi_cache_background_update on;
+  # Enable revalidation using If-Modified-Since and If-None-Match for stale items
+  fastcgi_cache_revalidate on;
+
+  # Ignore client abort as it causes issues with the pipeline
+  fastcgi_ignore_client_abort on;
 
   fastcgi_catch_stderr "Image handling error";
 
-  fastcgi_next_upstream_tries 3;
+  fastcgi_next_upstream error timeout invalid_header http_500 http_503;
+  fastcgi_next_upstream_tries 8;
 
   # Do not GZIP tiles
   gzip off;