From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Nov 2011 09:17:07 +0000 (+0000)
Subject: Only apply the hard memory limit when running under passenger
X-Git-Tag: live~6020
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56ddd1a21fabf95f7801a3a994ec22a9029c53c8

Only apply the hard memory limit when running under passenger
---

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index d3bd7a16b..ce518269f 100644
--- a/config/initializers/memory_limits.rb
+++ b/config/initializers/memory_limits.rb
@@ -1,5 +1,5 @@
 # Setup any specified hard limit on the virtual size of the process
-if defined?(HARD_MEMORY_LIMIT) and Process.const_defined?(:RLIMIT_AS)
+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