Merge branch 'master' into openid

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

diff --git a/config/initializers/memory_limits.rb b/config/initializers/memory_limits.rb
index e2dcee23c1a438287099317bdffbe05f7fc340f5..d3bd7a16b27627539a11a6253bf1073e82e6f98e 100644 (file)
--- a/config/initializers/memory_limits.rb
+++ b/config/initializers/memory_limits.rb
@@ -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
-        Process.kill("USR1", 0)
+        Process.kill("USR1", Process.pid)
       end
       
       # Return the result of this request