From 36f949db47cbda039c4c989f363ebd932686cb96 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Sep 2018 01:48:10 +0100 Subject: [PATCH] imagery: better fastcgi handling --- cookbooks/imagery/resources/site.rb | 2 +- .../default/nginx_imagery_layer_fragment.conf.erb | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 40d6ae62f..a5dc23d0c 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -96,7 +96,7 @@ action :create do environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/", "MS_DEBUGLEVEL" => "0", "MS_ERRORFILE" => "stderr", - "GDAL_CACHEMAX" => "256" + "GDAL_CACHEMAX" => "128" limit_nofile 16384 memory_high "512M" memory_max "1G" 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 5ef9a15f9..922ec7a96 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -8,21 +8,27 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { include fastcgi_params; fastcgi_param REQUEST_METHOD "GET"; fastcgi_param HTTP_PROXY ""; - fastcgi_read_timeout 300s; + fastcgi_read_timeout 60s; # Caching fastcgi_cache "fastcgi_cache_zone"; fastcgi_cache_key "<%= @layer %><%= @revision %> $request_method $1 $2 $3"; - fastcgi_keep_conn on; + + # Free connection to socket for other requests + fastcgi_keep_conn off; + fastcgi_cache_lock on; - fastcgi_cache_lock_timeout 60s; + fastcgi_cache_lock_timeout 30s; fastcgi_cache_valid 200 21d; fastcgi_cache_use_stale error timeout updating http_500 http_503; - fastcgi_ignore_client_abort on; + # Leaflet aborts connection still in flight to free up resources + fastcgi_ignore_client_abort off; fastcgi_catch_stderr "Image handling error"; + fastcgi_next_upstream_tries 3; + # Do not GZIP tiles gzip off; -- 2.43.2