From: Tom Hughes <tom@compton.nu>
Date: Sun, 6 Nov 2011 11:17:42 +0000 (+0000)
Subject: Disable hard memory limits
X-Git-Tag: live~6030
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/49f4a78240c252539c4e781c634e71a3574b43c0

Disable hard memory limits
---

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index d3bd7a16b..e1a1e07c3 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