From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 Nov 2011 19:06:11 +0000 (+0000)
Subject: Reinstate memory limits now we're not using rhino
X-Git-Tag: live~6070
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/69f535af329b0a9fb345e1d22bf6830f6bea5937?ds=sidebyside

Reinstate memory limits now we're not using rhino
---

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index e1a1e07c3..d3bd7a16b 100644
--- a/config/initializers/memory_limits.rb
+++ b/config/initializers/memory_limits.rb
@@ -1,7 +1,7 @@
 # Setup any specified hard limit on the virtual size of the process
-#if defined?(HARD_MEMORY_LIMIT) and Process.const_defined?(:RLIMIT_AS)
-#  Process.setrlimit Process::RLIMIT_AS, HARD_MEMORY_LIMIT*1024*1024, Process::RLIM_INFINITY
-#end
+if defined?(HARD_MEMORY_LIMIT) and Process.const_defined?(:RLIMIT_AS)
+  Process.setrlimit Process::RLIMIT_AS, HARD_MEMORY_LIMIT*1024*1024, Process::RLIM_INFINITY
+end
 
 # If we're running under passenger and a soft memory limit is
 # configured then setup some rack middleware to police the limit