Update to rails 4.1.6

[rails.git] / config / initializers / memory_limits.rb

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index e1a1e07c3ebb5d23eb930c61dcd8e95cb62022d4..ce518269fc64085ce39d2b9f97991ad95f8343cc 100644 (file)
--- 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
 # 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 defined?(PhusionPassenger) 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
 
 # If we're running under passenger and a soft memory limit is
 # configured then setup some rack middleware to police the limit