Apply memory limits to mapserv

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 228839838a28d5ac3fd1b1c6c44d93f5ea5ff04a..7da41f7bf4c4154560a37bd65e2858642c588ff2 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -70,6 +70,8 @@ action :create do
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"
     limit_nofile 16384
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"
     limit_nofile 16384

+    memory_high "1G"
+    memory_max "2G"

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index eff763f32df6e9ba505cf79ed640bd67b96c96fc..c31b6d0bc782695bcad2e3089bb12db45f6ab298 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -27,6 +27,9 @@ property :type, String,
          :default => "simple",
          :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer
          :default => "simple",
          :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer

+property :memory_low, [Integer, String]
+property :memory_high, [Integer, String]
+property :memory_max, [Integer, String]

 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String

diff --git a/cookbooks/systemd/templates/default/service.erb b/cookbooks/systemd/templates/default/service.erb
index f7f851ae54160b373cbc40f5d3506099c731bd7e..b3e0c13e297fbc2b425fa866f3ef7520ca2b29a1 100644 (file)
--- a/cookbooks/systemd/templates/default/service.erb
+++ b/cookbooks/systemd/templates/default/service.erb
@@ -14,6 +14,15 @@ Type=<%= @type %>
 <% if @limit_nofile -%>
 LimitNOFILE=<%= @limit_nofile %>
 <% end -%>
 <% if @limit_nofile -%>
 LimitNOFILE=<%= @limit_nofile %>
 <% end -%>

+<% if @memory_low -%>
+MemoryLow=<%= @memory_low %>
+<% end -%>
+<% if @memory_high -%>
+MemoryHigh=<%= @memory_high %>
+<% end -%>
+<% if @memory_max -%>
+MemoryMax=<%= @memory_max %>
+<% end -%>

 <% @environment.each do |name,value| -%>
 Environment="<%= name %>=<%= value %>"
 <% end -%>
 <% @environment.each do |name,value| -%>
 Environment="<%= name %>=<%= value %>"
 <% end -%>