adamcooke · October 19, 2009 18:59 · Oct 19, 2009 · Oct 19, 2009 · Oct 19, 2009 · Mar 5, 2009
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -3,13 +3,7 @@
 require 'rubygems'
 require 'daemons'
 
-
-options = {}
-options[:log_output] = true
-options[:dir] = File.expand_path('../../log/', __FILE__)
-options[:dir_mode] = :normal
-
-Daemons.run_proc('PassengerMonitor', options) do
+Daemons.run_proc('PassengerMonitor') do
 
   command = 'sudo passenger-memory-stats'
   memory_limit = 250

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -38,8 +38,8 @@ Daemons.run_proc('PassengerMonitor', options) do
       else
         puts "Process ##{pid} is not above limit (#{private}MB)"
       end
-      sleep 120
     end
+    sleep 120
   end
 
 end
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -1,27 +1,45 @@
-#!/usr/bin/env ruby
-
-command = '/opt/ruby-enterprise-1.8.6-20080810/bin/passenger-memory-stats'
-memory_limit = 200 # megabytes
-
-def running?(pid)
-  begin
-    return Process.getpgid(pid) != -1
-  rescue Errno::ESRCH
-    return false
-  end
-end
-
-`#{command}`.each_line do |line|
-  next unless /(\d+)\s+\d+\s+(\d+\.\d+)\s+MB\s+(\d+\.\d+)\s+MB\s+Rails:/.match(line)
-  all, pid, vm_size, private = $~.to_a
-  if private.to_i > memory_limit
-    puts "#{Time.now}: Killing #{pid}, memory usage == #{private}"
-    Process.kill("SIGUSR1", pid.to_i)
-    puts "Finished kill attempt. Sleeping for 20 seconds..."
-    sleep 20
-    if running?(pid.to_i)
-      puts "Process is still running, sending term signal"
-      Process.kill("KILL", pid.to_i)
-    end
-  end
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'daemons'
+
+
+options = {}
+options[:log_output] = true
+options[:dir] = File.expand_path('../../log/', __FILE__)
+options[:dir_mode] = :normal
+
+Daemons.run_proc('PassengerMonitor', options) do
+
+  command = 'sudo passenger-memory-stats'
+  memory_limit = 250
+
+  def running?(pid)
+    begin
+      return Process.getpgid(pid) != -1
+    rescue Errno::ESRCH
+      return false
+   end
+  end
+
+  loop do
+    `#{command}`.each_line do |line|
+      next unless /(\d+)\s+\d+\s+(\d+\.\d+)\s+MB\s+(\d+\.\d+)\s+MB\s+Rails:/.match(line)
+      all, pid, vm_size, private = $~.to_a
+      if private.to_i > memory_limit
+        puts "#{Time.now}: Killing #{pid}, memory usage == #{private}"
+        Process.kill("SIGUSR1", pid.to_i)
+        puts "Finished kill attempt. Sleeping for 20 seconds to give it time to die..."
+        sleep 20
+        if running?(pid.to_i)
+          puts "Process is still running - die bitch"
+          Process.kill("KILL", pid.to_i)
+        end
+      else
+        puts "Process ##{pid} is not above limit (#{private}MB)"
+      end
+      sleep 120
+    end
+  end
+
 end
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -21,7 +21,7 @@ end
     sleep 20
     if running?(pid.to_i)
       puts "Process is still running, sending term signal"
-      Process.kill("TERM", pid.to_i)
+      Process.kill("KILL", pid.to_i)
     end
   end
 end
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+command = '/opt/ruby-enterprise-1.8.6-20080810/bin/passenger-memory-stats'
+memory_limit = 200 # megabytes
+
+def running?(pid)
+  begin
+    return Process.getpgid(pid) != -1
+  rescue Errno::ESRCH
+    return false
+  end
+end
+
+`#{command}`.each_line do |line|
+  next unless /(\d+)\s+\d+\s+(\d+\.\d+)\s+MB\s+(\d+\.\d+)\s+MB\s+Rails:/.match(line)
+  all, pid, vm_size, private = $~.to_a
+  if private.to_i > memory_limit
+    puts "#{Time.now}: Killing #{pid}, memory usage == #{private}"
+    Process.kill("SIGUSR1", pid.to_i)
+    puts "Finished kill attempt. Sleeping for 20 seconds..."
+    sleep 20
+    if running?(pid.to_i)
+      puts "Process is still running, sending term signal"
+      Process.kill("TERM", pid.to_i)
+    end
+  end
+end