From 28846fc961ca1c067b9ff5ad85a8c6e5d3b7b713 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 11 Jun 2016 19:34:11 +0100 Subject: [PATCH] imagery: do not cache mapserver errors --- cookbooks/imagery/resources/layer.rb | 4 +++- .../templates/default/nginx_imagery_layer_fragment.conf.erb | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb index e6a78d32d..b9fb548c3 100644 --- a/cookbooks/imagery/resources/layer.rb +++ b/cookbooks/imagery/resources/layer.rb @@ -67,7 +67,9 @@ action :create do description "Map server for #{layer} layer" limit_nofile 16384 environment "MS_MAPFILE" => "/srv/imagery/mapserver/layer-#{layer}.map", - "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/" + "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/", + "MS_DEBUGLEVEL" => "0", + "MS_ERRORFILE" => "stderr" user "imagery" group "imagery" exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{layer}.socket" 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 4146da174..036c8ac23 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -16,6 +16,10 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { fastcgi_cache_valid 200 21d; fastcgi_cache_use_stale error timeout updating http_500 http_503; + fastcgi_ignore_client_abort on; + + fastcgi_catch_stderr "Image handling error"; + # Do not GZIP tiles gzip off; -- 2.43.2