]> git.openstreetmap.org Git - rails.git/commitdiff
Reinstate memory limits now we're not using rhino
authorTom Hughes <tom@compton.nu>
Mon, 14 Nov 2011 19:06:11 +0000 (19:06 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 14 Nov 2011 19:06:11 +0000 (19:06 +0000)
config/initializers/memory_limits.rb

index e1a1e07c3ebb5d23eb930c61dcd8e95cb62022d4..d3bd7a16b27627539a11a6253bf1073e82e6f98e 100644 (file)
@@ -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