From: Grant Slater Date: Tue, 5 Oct 2021 23:50:20 +0000 (+0100) Subject: imagery: terminate service after max runtime X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9d8030036f1c28dcc42fd3964839430c4bd72aa2 imagery: terminate service after max runtime --- diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 699adbacb..1a1ef97e6 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -100,17 +100,6 @@ action :create do base_domains = [new_resource.site] + Array(new_resource.aliases) tile_domains = base_domains.flat_map { |d| [d, "a.#{d}", "b.#{d}", "c.#{d}"] } - # FIXME Clean up old service - service "mapserv-fcgi-#{new_resource.site}@" do - provider Chef::Provider::Service::Systemd - action [:stop, :disable] - end - - # FIXME Clean up old service - systemd_service "mapserv-fcgi-#{new_resource.site}@" do - action :delete - end - systemd_service "mapserv-fcgi-#{new_resource.site}" do description "Map server for #{new_resource.site} layer" environment "MS_MAP_PATTERN" => "^/srv/imagery/mapserver/", @@ -118,11 +107,11 @@ action :create do "MS_ERRORFILE" => "stderr", "GDAL_CACHEMAX" => "512" limit_nofile 16384 - memory_high "512M" - memory_max "1G" + memory_high "1G" + memory_max "2G" user "imagery" group "imagery" - exec_start "/usr/bin/multiwatch -f 4 -- /usr/lib/cgi-bin/mapserv" + exec_start "/usr/bin/multiwatch -f 6 --signal=TERM -- /usr/lib/cgi-bin/mapserv" standard_input "socket" private_tmp true private_devices true @@ -130,6 +119,8 @@ action :create do protect_system "full" protect_home true no_new_privileges true + # Terminate service after 5mins. Service is socket activated + runtime_max_sec 300 end systemd_socket "mapserv-fcgi-#{new_resource.site}" do