Merge branch 'master' into openstreetbugs

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

diff --git a/config/initializers/limits.rb b/config/initializers/limits.rb
index 485d95e9c98c03d57547d815c35389ac00215df1..9862036f7f2646a0a426d0f5470c15eb5f5e49e7 100644 (file)
--- a/config/initializers/limits.rb
+++ b/config/initializers/limits.rb
@@ -1,8 +1,4 @@
-# Limit each rails process to a 512Mb resident set size if possible
+# Set a hard limit of 1Gb on the virtual size of the process
 if Process.const_defined?(:RLIMIT_AS)
-  Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
+  Process.setrlimit Process::RLIMIT_AS, 1024*1024*1024, Process::RLIM_INFINITY
 end
-
-# Force a restart after every 10000 requests
-COUNT = 0
-MAX_COUNT = 10000