From d98182d9ec0adc300ab7af989a8127113514f04e Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 24 Sep 2022 04:21:19 +0100 Subject: [PATCH] imagery: use nginx more fastcgi defaults. Fewer mapserv processes --- cookbooks/imagery/resources/site.rb | 2 +- .../templates/default/nginx_imagery_layer_fragment.conf.erb | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index f81e95ad8..300800f0a 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -111,7 +111,7 @@ action :create do memory_max "2G" user "imagery" group "imagery" - exec_start "/usr/bin/multiwatch -f 12 --signal=TERM -- /usr/lib/cgi-bin/mapserv" + exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv" standard_input "socket" private_tmp true private_devices true 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 372bf0e56..f28629237 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery_layer_fragment.conf.erb @@ -3,8 +3,6 @@ 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 "<%= @site %>_fastcgi"; - fastcgi_buffers 8 64k; - fastcgi_busy_buffers_size 64k; include fastcgi_params; fastcgi_param REQUEST_METHOD "GET"; fastcgi_param HTTP_PROXY ""; @@ -28,9 +26,6 @@ location ~* "^/layer/<%= @layer %>/(\d+)/(\d+)/(\d+)\.(png|jpg|jpeg)$" { keepalive_requests 0; - # Ignore client abort as it causes issues with the pipeline - fastcgi_ignore_client_abort on; - fastcgi_catch_stderr "Image handling error"; fastcgi_next_upstream error timeout invalid_header http_500 http_503; -- 2.43.2