god 0.7.0 → 0.7.3

data/History.txt

@@ -1,3 +1,20 @@
+== 0.7.3 / 2008-02-14
+  * Minor Enhancements
+    * Add --bleakhouse to make running diagnostics easier
+  * Bug Fixes
+    * Use ::Process.kill(0, ...) instead of `kill -0`
+    * Fix pid_file behavior in process-centric conditions so they work with tasks
+    * Redirect output of daemonized god to log file or /dev/null earlier
+
+== 0.7.2 / 2008-02-04
+  * Bug Fixes
+    * Start event system for CLI commands
+    * Up internal history to 100 lines per watch
+
+== 0.7.1 / 2008-02-04
+  * Minor Enhancements
+    * Add --no-events option to completely disable events system
+
 == 0.7.0 / 2008-02-01
   * Minor Enhancements
     * Better default pid_file_directory behavior

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('god', '0.7.0') do |p|
+Hoe.new('god', '0.7.3') do |p|
   p.rubyforge_name = 'god'
   p.author = 'Tom Preston-Werner'
   p.email = 'tom@rubyisawesome.com'

data/bin/god

@@ -9,7 +9,7 @@ require 'optparse'
 require 'drb'
 
 begin
-  options = {:daemonize => true, :port => 17165, :syslog => true}
+  options = {:daemonize => true, :port => 17165, :syslog => true, :events => true}
 
   opts = OptionParser.new do |opts|
     opts.banner = <<-EOF
@@ -83,6 +83,14 @@ begin
     opts.on("--attach PID", "Quit god when the attached process dies") do |x|
       options[:attach] = x
     end
+    
+    opts.on("--no-events", "Disable the event system") do
+      options[:events] = false
+    end
+    
+    opts.on("--bleakhouse", "Enable bleakhouse profiling") do
+      options[:bleakhouse] = true
+    end
   end
   
   opts.parse!
@@ -98,9 +106,11 @@ begin
     God::CLI::Version.version
   elsif !options[:config] && options[:info]
     require 'god'
+    God::EventHandler.load
     God::CLI::Version.version_extended
   elsif !options[:config] && command = ARGV[0]
     require 'god'
+    God::EventHandler.load
     God::CLI::Command.new(command, options, ARGV)
   else
     require 'god/cli/run'

data/lib/god.rb

@@ -89,9 +89,6 @@ def root_binding
   binding
 end
 
-# Load the event handler system
-God::EventHandler.load
-
 module Kernel
   alias_method :abort_orig, :abort
   
@@ -133,9 +130,9 @@ class Module
 end
 
 module God
-  VERSION = '0.7.0'
+  VERSION = '0.7.3'
   
-  LOG_BUFFER_SIZE_DEFAULT = 10
+  LOG_BUFFER_SIZE_DEFAULT = 100
   PID_FILE_DIRECTORY_DEFAULTS = ['/var/run/god', '~/.god/pids']
   DRB_PORT_DEFAULT = 17165
   DRB_ALLOW_DEFAULT = ['127.0.0.1']
@@ -149,7 +146,8 @@ module God
                        :allow,
                        :log_buffer_size,
                        :pid_file_directory,
-                       :log_level
+                       :log_level,
+                       :use_events
     
     # internal
     attr_accessor :inited,

data/lib/god/cli/run.rb

@@ -43,16 +43,11 @@ module God
             
             log_file = @options[:log] || "/dev/null"
             
-            unless God::EventHandler.loaded?
-              puts
-              puts "***********************************************************************"
-              puts "*"
-              puts "* Event conditions are not available for your installation of god."
-              puts "* You may still use and write custom conditions using the poll system"
-              puts "*"
-              puts "***********************************************************************"
-              puts
-            end
+            # reset file descriptors
+            STDIN.reopen "/dev/null"
+            STDOUT.reopen(log_file, "a")
+            STDERR.reopen STDOUT
+            STDOUT.sync = true
             
             # start attached pid watcher if necessary
             if @options[:attach]
@@ -73,6 +68,21 @@ module God
               Logger.syslog = false
             end
             
+            if @options[:events]
+              God::EventHandler.load
+            end
+            
+            unless God::EventHandler.loaded?
+              puts
+              puts "***********************************************************************"
+              puts "*"
+              puts "* Event conditions are not available for your installation of god."
+              puts "* You may still use and write custom conditions using the poll system"
+              puts "*"
+              puts "***********************************************************************"
+              puts
+            end
+            
             # load config
             if @options[:config]
               # set log level, defaults to WARN
@@ -101,12 +111,6 @@ module God
                 end
               end
             end
-            
-            # reset file descriptors
-            STDIN.reopen "/dev/null"
-            STDOUT.reopen(log_file, "a")
-            STDERR.reopen STDOUT
-            STDOUT.sync = true
           rescue => e
             puts e.message
             puts e.backtrace.join("\n")
@@ -126,6 +130,10 @@ module God
       def run_in_front
         require 'god'
         
+        if @options[:bleakhouse]
+          BleakHouseDiagnostic.install
+        end
+        
         # start attached pid watcher if necessary
         if @options[:attach]
           self.attach
@@ -135,6 +143,10 @@ module God
           God.port = @options[:port]
         end
         
+        if @options[:events]
+          God::EventHandler.load
+        end
+        
         # set log level if requested
         if @options[:log_level]
           God.log_level = @options[:log_level]

data/lib/god/conditions/cpu_usage.rb

@@ -50,12 +50,12 @@ module God
       end
       
       def pid
-        self.watch.pid || File.read(self.pid_file).strip.to_i
+        self.pid_file ? File.read(self.pid_file).strip.to_i : self.watch.pid
       end
       
       def valid?
         valid = true
-        valid &= complain("Attribute 'pid_file' must be specified", self) if self.watch.pid_file.nil? && self.pid_file.nil?
+        valid &= complain("Attribute 'pid_file' must be specified", self) if self.pid_file.nil? && self.watch.pid_file.nil?
         valid &= complain("Attribute 'above' must be specified", self) if self.above.nil?
         valid
       end

data/lib/god/conditions/memory_usage.rb

@@ -52,12 +52,12 @@ module God
       end
       
       def pid
-        self.watch.pid || File.read(self.pid_file).strip.to_i
+        self.pid_file ? File.read(self.pid_file).strip.to_i : self.watch.pid
       end
       
       def valid?
         valid = true
-        valid &= complain("Attribute 'pid_file' must be specified", self) if self.watch.pid_file.nil? && self.pid_file.nil?
+        valid &= complain("Attribute 'pid_file' must be specified", self) if self.pid_file.nil? && self.watch.pid_file.nil?
         valid &= complain("Attribute 'above' must be specified", self) if self.above.nil?
         valid
       end

data/lib/god/conditions/process_exits.rb

@@ -23,6 +23,8 @@ module God
     #     c.pid_file = "/var/run/mongrel.3000.pid"
     #   end
     class ProcessExits < EventCondition
+      attr_accessor :pid_file
+      
       def initialize
         self.info = "process exited"
       end
@@ -31,8 +33,12 @@ module God
         true
       end
       
+      def pid
+        self.pid_file ? File.read(self.pid_file).strip.to_i : self.watch.pid
+      end
+      
       def register
-        pid = self.watch.pid
+        pid = self.pid
         
         begin
           EventHandler.register(pid, :proc_exit) do |extra|
@@ -49,14 +55,15 @@ module God
       end
       
       def deregister
-        pid = self.watch.pid
+        pid = self.pid
         if pid
           EventHandler.deregister(pid, :proc_exit)
           
           msg = "#{self.watch.name} deregistered 'proc_exit' event for pid #{pid}"
           applog(self.watch, :info, msg)
         else
-          applog(self.watch, :error, "#{self.watch.name} could not deregister: no cached PID or PID file #{self.watch.pid_file} (#{self.base_name})")
+          pid_file_location = self.pid_file || self.watch.pid_file
+          applog(self.watch, :error, "#{self.watch.name} could not deregister: no cached PID or PID file #{pid_file_location} (#{self.base_name})")
         end
       end
     end

data/lib/god/conditions/process_running.rb

@@ -37,12 +37,12 @@ module God
       attr_accessor :running, :pid_file
       
       def pid
-        self.watch.pid || File.read(self.pid_file).strip.to_i
+        self.pid_file ? File.read(self.pid_file).strip.to_i : self.watch.pid
       end
       
       def valid?
         valid = true
-        valid &= complain("Attribute 'pid_file' must be specified", self) if self.watch.pid_file.nil? && self.pid_file.nil?
+        valid &= complain("Attribute 'pid_file' must be specified", self) if self.pid_file.nil? && self.watch.pid_file.nil?
         valid &= complain("Attribute 'running' must be specified", self) if self.running.nil?
         valid
       end
@@ -50,12 +50,7 @@ module God
       def test
         self.info = []
         
-        # unless File.exist?(self.watch.pid_file)
-        #   self.info << "#{self.watch.name} #{self.class.name}: no such pid file: #{self.watch.pid_file}"
-        #   return !self.running
-        # end
-        
-        pid = self.watch.pid
+        pid = self.pid
         active = pid && System::Process.new(pid).exists?
         
         if (self.running && active)

data/lib/god/diagnostics.rb

@@ -22,8 +22,8 @@ class BleakHouseDiagnostic
     File.delete(LOG_FILE) rescue nil
   end
   
-  def self.snapshot
-    self.logger.snapshot(LOG_FILE, "timer", false) if self.logger
+  def self.snapshot(name)
+    self.logger.snapshot(LOG_FILE, name, false) if self.logger
   end
   
   def self.spin(delay = 1)

data/lib/god/event_handler.rb

@@ -40,12 +40,13 @@ module God
     
     def self.deregister(pid, event=nil)
       if watching_pid? pid
+        running = ::Process.kill(0, pid.to_i) rescue false
         if event.nil?
           @@actions.delete(pid)
-          @@handler.register_process(pid, []) if system("kill -0 #{pid} &> /dev/null")
+          @@handler.register_process(pid, []) if running
         else
           @@actions[pid].delete(event)
-          @@handler.register_process(pid, @@actions[pid].keys) if system("kill -0 #{pid} &> /dev/null")
+          @@handler.register_process(pid, @@actions[pid].keys) if running
         end
       end
     end

data/lib/god/system/process.rb

@@ -8,7 +8,7 @@ module God
       
       # Return true if this process is running, false otherwise
       def exists?
-        system("kill -0 #{@pid} &> /dev/null")
+        !!::Process.kill(0, @pid) rescue false
       end
       
       # Memory usage in kilobytes (resident set size)

data/test/helper.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
+God::EventHandler.load
 
 require 'test/unit'
 require 'set'

data/test/test_process.rb

@@ -115,7 +115,7 @@ class TestProcessDaemon < Test::Unit::TestCase
   # alive?
   
   def test_alive_should_call_system_process_exists
-    File.expects(:read).with('blah.pid').returns('1234')
+    File.expects(:read).with('blah.pid').times(2).returns('1234')
     System::Process.any_instance.expects(:exists?).returns(false)
     assert !@p.alive?
   end
@@ -165,7 +165,7 @@ class TestProcessDaemon < Test::Unit::TestCase
     File.stubs(:read).returns("123")
     assert_equal 123, @p.pid
     
-    File.stubs(:read).returns("")
+    File.stubs(:read).raises(Errno::ENOENT)
     assert_equal 123, @p.pid
     
     File.stubs(:read).returns("246")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2008-02-01 00:00:00 -08:00
+  version: 0.7.3
+date: 2008-02-13 00:00:00 -08:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -176,5 +176,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.0
     version: