From: Grant Slater <git@firefishy.com>
Date: Fri, 6 Jul 2018 09:35:13 +0000 (+0100)
Subject: Imagery: lower memory limit + switch to pure spawn-fcgi
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/ef9302d6b4f6bd5b72663af39e340782fdf511ec?ds=sidebyside

Imagery: lower memory limit + switch to pure spawn-fcgi
---

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 7da41f7bf..0fd38f2f8 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -70,12 +70,12 @@ action :create do
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"
     limit_nofile 16384
-    memory_high "1G"
+    memory_high "512M"
     memory_max "2G"
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket"
-    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -- /usr/bin/multiwatch -f 3 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
+    exec_start "/usr/bin/spawn-fcgi -n -s /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket -M 0666 -P /run/mapserver-fastcgi/layer-#{new_resource.layer}.pid -F 4 -- /usr/lib/cgi-bin/mapserv"
     private_tmp true
     private_devices true
     private_network true