imagery: stop mapserver more frequently

[chef.git] / cookbooks / imagery / resources / site.rb

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index d9dad4be87bb5bbb51c34d9027a89ffe561d622a..7137458b3b19313553b17f2b6fbf8d2c2751a3b8 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -107,12 +107,14 @@ action :create do
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

+    memory_max "8G"

     user "imagery"
     group "imagery"
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     sandbox true
     restrict_address_families "AF_UNIX"
     user "imagery"
     group "imagery"
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     sandbox true
     restrict_address_families "AF_UNIX"

+    timeout_stop_sec 60

     not_if { new_resource.uses_tiler }
   end
 
     not_if { new_resource.uses_tiler }
   end
 


@@ -151,8 +153,8 @@ action :create do
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"
 
   systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
     on_boot_sec "10m"

-    on_unit_inactive_sec "1h"
-    randomized_delay_sec "30m"
+    on_unit_inactive_sec "30m"
+    randomized_delay_sec "20m"

     not_if { new_resource.uses_tiler }
   end
 
     not_if { new_resource.uses_tiler }
   end