imagery: limit mapserv by CPU time

Use CPU time as a poor mans process limit, to kill process before it has leaked
too much memory. Memory limits do not seem to kill the process.

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 16e48d3804070f1941a3f0719aa240cc10083224..86c70c37ec021a85087e04ecf62fe574c34c1d3e 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -106,8 +106,8 @@ action :create do
                   "MS_ERRORFILE" => "stderr",
                   "GDAL_CACHEMAX" => "512"
       limit_nofile 16384
                   "MS_ERRORFILE" => "stderr",
                   "GDAL_CACHEMAX" => "512"
       limit_nofile 16384

-      limit_as "1G"
-      memory_max "2G"
+      limit_cpu: 60
+      memory_max "4G"

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