Merge rails_port as of r4613 & fix tests.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 570cb04b5f6d365877b540892dba6b707267e00a..3820ed29406f69a1b84808af0ef0dfa9c6e5244a 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,8 @@
 # Be sure to restart your web server when you modify this file.
 
+# Limit each rails process to a 512Mb resident set size
+Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
+
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'