imagery: allow longer for mapserver to shutdown

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

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index a91f9794c4eab06b7a51e46eabd8201a0fe25149..83926229a50a42bb559283c4f1ef844e63491178 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -103,21 +103,17 @@ action :create do
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"
 
   systemd_service "mapserv-fcgi-#{new_resource.site}" do
     description "Map server for #{new_resource.site} layer"

-    environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/",
-                "MS_DEBUGLEVEL" => "0",
+    environment "MS_DEBUGLEVEL" => "0",

                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384
                 "MS_ERRORFILE" => "stderr",
                 "GDAL_CACHEMAX" => "512"
     limit_nofile 16384

-    memory_high "1G"
-    memory_max "4G"

     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"

-    # Terminate service after 30mins. Service is socket activated
-    runtime_max_sec 1800
+    timeout_stop_sec 60

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


@@ -144,6 +140,28 @@ action :create do
     not_if { new_resource.uses_tiler }
   end
 
     not_if { new_resource.uses_tiler }
   end
 

+  # mapserver leaks memory, so restart it regularly. It is activated automatically by socket
+  systemd_service "mapserv-fcgi-#{new_resource.site}-stop" do
+    type "simple"
+    user "root"
+    exec_start "/bin/systemctl --quiet stop mapserv-fcgi-#{new_resource.site}.service"
+    sandbox true
+    restrict_address_families "AF_UNIX"
+    not_if { new_resource.uses_tiler }
+  end
+
+  systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do
+    on_boot_sec "10m"
+    on_unit_inactive_sec "1h"
+    randomized_delay_sec "30m"
+    not_if { new_resource.uses_tiler }
+  end
+
+  service "mapserv-fcgi-#{new_resource.site}-stop.timer" do
+    action [:enable, :start]
+    not_if { new_resource.uses_tiler }
+  end
+

   ssl_certificate new_resource.site do
     domains tile_domains
   end
   ssl_certificate new_resource.site do
     domains tile_domains
   end