Localisation updates from http://translatewiki.net.

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

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index e2dcee23c1a438287099317bdffbe05f7fc340f5..ce518269fc64085ce39d2b9f97991ad95f8343cc 100644 (file)
--- 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
 # 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
 
   Process.setrlimit Process::RLIMIT_AS, HARD_MEMORY_LIMIT*1024*1024, Process::RLIM_INFINITY
 end
 


@@ -18,7 +18,7 @@ if defined?(SOFT_MEMORY_LIMIT) and defined?(PhusionPassenger)
       
       # Restart if we've hit our memory limit
       if resident_size > SOFT_MEMORY_LIMIT
       
       # Restart if we've hit our memory limit
       if resident_size > SOFT_MEMORY_LIMIT

-        Process.kill("USR1", 0)
+        Process.kill("USR1", Process.pid)

       end
       
       # Return the result of this request
       end
       
       # Return the result of this request