imagery: workaround mapserv defer memory leak

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index e1850849122e82e96a249ef73d420bcf7824796f..19d18e5a4500ae1e434d7fed427c169e69728ef3 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -105,8 +105,7 @@ action :create do
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "128"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "128"
     limit_nofile 16384

-    memory_high "512M"
-    memory_max "1G"
+    memory_max "2G"

     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}.socket"
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.site}.socket"

diff --git a/cookbooks/imagery/templates/default/mapserver.map.erb b/cookbooks/imagery/templates/default/mapserver.map.erb
index 84a3803d01256f76d373898d2c189561a72b1341..d44f3ec781d717260a0f174030a4c04222a8d945 100644 (file)
--- a/cookbooks/imagery/templates/default/mapserver.map.erb
+++ b/cookbooks/imagery/templates/default/mapserver.map.erb
@@ -49,6 +49,6 @@ MAP
     STATUS       DEFAULT
     TYPE         RASTER
     PROCESSING   "RESAMPLE=AVERAGE"
     STATUS       DEFAULT
     TYPE         RASTER
     PROCESSING   "RESAMPLE=AVERAGE"

-    PROCESSING   "CLOSE_CONNECTION=DEFER"
+    PROCESSING   "CLOSE_CONNECTION=NORMAL"

   END # layer
 END
   END # layer
 END