god 0.7.22 → 0.8.0

data/History.txt

@@ -1,3 +1,23 @@
+== 0.8.0 / 2009-11-30
+  * Minor Enhancements
+    * Rubygems decontamination
+    * Use Monitor instead of Mutex to provide ability to wait with a timeout
+    * Only generate log messages when they're being used
+    * Remove usage of Thread.critical in DriverEventQueue
+    * Update to work with latest bleak-house
+    * Cache some frequent lookups to reduce object creation
+    * Changing the @io.print call in SimpleLogger to not concatenate
+      the formatted results before printing
+  * Bug fixes
+    * Make sure we don't leak hash slots when processes die
+    * Make sure the driver is shutdown on Task#unregister!
+    * Fix memory leak when issuing "god load" successfully
+    * Fix defunct process
+
+== NOTE
+  At this point I will stop giving credit in the history. Look at the author
+  and committer in the commit for that info.
+
 == 0.7.22 / 2009-10-29
   * Minor Enhancements
     * Save ARGV so we can get access to it later if we want [github.com/eric]

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
 :major: 0
-:minor: 7
-:patch: 22
+:minor: 8
+:build: 
+:patch: 0

data/god.gemspec

@@ -1,20 +1,20 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.22"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-30}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}
   s.executables = ["god"]
-  s.extensions = ["ext/god/extconf.rb"]
+  s.extensions = ["ext/god/extconf.rb", "ext/god/extconf.rb"]
   s.extra_rdoc_files = [
     "README.txt"
   ]
@@ -224,3 +224,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/god.rb

@@ -1,8 +1,5 @@
 $:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
 
-# rubygems
-require 'rubygems'
-
 # core
 require 'stringio'
 require 'fileutils'
@@ -534,6 +531,9 @@ module God
       watches = self.pending_watches.dup
       self.pending_watches.clear
       self.pending_watch_states.clear
+
+      # make sure we quit capturing when we're done
+      LOG.finish_capture
     rescue Exception => e
       # don't ever let running_load take down god
       errors << LOG.finish_capture

data/lib/god/cli/command.rb

@@ -215,6 +215,7 @@ module God
             puts "killing process"
             
             ::Process.kill('KILL', pid)
+            ::Process.waitpid(pid)
           rescue => e
             puts e.message
             puts e.backtrace.join("\n")

data/lib/god/contacts/jabber.rb

@@ -10,7 +10,6 @@
 #   end
 
 module XMPP4R
-  require 'rubygems'
   require 'xmpp4r'
   include Jabber
 end

data/lib/god/contacts/twitter.rb

@@ -10,7 +10,6 @@
 #     c.group     = 'developers'
 #   end
 
-require 'rubygems'
 require 'twitter'
 
 module God

data/lib/god/diagnostics.rb

@@ -12,26 +12,26 @@ end
 class BleakHouseDiagnostic
   LOG_FILE = File.join(File.dirname(__FILE__), *%w[.. .. logs bleak.log])
   
-  class << self
-    attr_accessor :logger
-  end
-  
   def self.install
-    require 'bleak_house'
-    self.logger = BleakHouse::Logger.new
-    File.delete(LOG_FILE) rescue nil
+    require 'snapshot'
+    self.spin
   end
   
-  def self.snapshot(name)
-    self.logger.snapshot(LOG_FILE, name, false) if self.logger
+  def self.snapshot
+    @count ||= 0
+    filename = "/tmp/god-bleak-%s-%03i.dump" % [Process.pid,@count]
+    STDERR.puts "** BleakHouse: working..."
+    BleakHouse.ext_snapshot(filename, 3)
+    STDERR.puts "** BleakHouse: complete\n** Bleakhouse: Run 'bleak #{filename}' to analyze."
+    @count += 1
   end
   
-  def self.spin(delay = 1)
+  def self.spin(delay = 60)
     Thread.new do
       loop do
-        self.snapshot
         sleep(delay)
+        self.snapshot
       end
     end
   end
-end
+end

data/lib/god/driver.rb

@@ -1,3 +1,5 @@
+require 'monitor'
+
 module God
   class TimedEvent
     include Comparable
@@ -52,29 +54,24 @@ module God
       @task.send(@name, *@args)
     end
   end
-  
-  class DriverEventQueue 
+
+  class DriverEventQueue
     def initialize
       @shutdown = false
-      @waiting = []
       @events = []
-      @waiting.taint
+      @monitor = Monitor.new
+      @resource = @monitor.new_cond
       @events.taint
       self.taint
     end
 
-    # 
+    #
     # Wake any sleeping threads after setting the sentinel
-    # 
+    #
     def shutdown
       @shutdown = true
-      begin
-        Thread.critical = true
-        @waiting.each do |t|
-          t.run
-        end
-      ensure
-        Thread.critical = false
+      @monitor.synchronize do
+        @resource.broadcast
       end
     end
 
@@ -82,47 +79,34 @@ module God
     # Sleep until the queue has something due
     #
     def pop
-      begin
-        while (Thread.critical = true; @events.empty? or !@events.first.due?)
-          @waiting.push Thread.current
-          if @events.empty?
-            raise ThreadError, "queue empty" if @shutdown
-            Thread.stop
-          else
-            Thread.critical = false
-            delay = @events.first.at - Time.now
-            sleep delay if delay > 0
-            Thread.critical = true
-          end
+      @monitor.synchronize do
+        if @events.empty?
+          raise ThreadError, "queue empty" if @shutdown
+          @resource.wait
+        else !@events.first.due?
+          delay = @events.first.at - Time.now
+          @resource.wait(delay) if delay > 0
         end
+
         @events.shift
-      ensure
-        Thread.critical = false
       end
     end
 
     alias shift pop
     alias deq pop
 
-    # 
-    # Add an event to the queue, wake any waiters if what we added needs to 
+    #
+    # Add an event to the queue, wake any waiters if what we added needs to
     # happen sooner than the next pending event
     #
     def push(event)
-      Thread.critical = true
-      @events << event
-      @events.sort!
-      begin
-        t = @waiting.shift if @events.first == event
-        t.wakeup if t
-      rescue ThreadError
-        retry
-      ensure
-        Thread.critical = false
-      end
-      begin
-        t.run if t
-      rescue ThreadError
+      @monitor.synchronize do
+        @events << event
+        @events.sort!
+
+        # If we've sorted the events and found the one we're adding is at
+        # the front, it will likely need to run before the next due date
+        @resource.signal if @events.first == event
       end
     end
 
@@ -130,7 +114,7 @@ module God
     alias enq push
 
     def empty?
-      @que.empty?
+      @events.empty?
     end
 
     def clear
@@ -142,16 +126,12 @@ module God
     end
 
     alias size length
-
-    def num_waiting
-      @waiting.size
-    end
   end
 
 
   class Driver
     attr_reader :thread
-    
+
     # Instantiate a new Driver and start the scheduler loop to handle events
     #   +task+ is the Task this Driver belongs to
     #
@@ -176,12 +156,26 @@ module God
       end
     end
     
+    # Check if we're in the driver context
+    #
+    # Returns true if in driver thread
+    def in_driver_context?
+      Thread.current == @thread
+    end
+
     # Clear all events for this Driver
     # 
     # Returns nothing
     def clear_events
       @events.clear
     end
+
+    # Shutdown the DriverEventQueue threads
+    #
+    # Returns nothing
+    def shutdown
+      @events.shutdown
+    end
     
     # Queue an asynchronous message
     #   +name+ is the Symbol name of the operation

data/lib/god/event_handler.rb

@@ -38,16 +38,12 @@ module God
       @@handler.register_process(pid, @@actions[pid].keys)
     end
     
-    def self.deregister(pid, event=nil)
+    def self.deregister(pid, event)
       if watching_pid? pid
         running = ::Process.kill(0, pid.to_i) rescue false
-        if event.nil?
-          @@actions.delete(pid)
-          @@handler.register_process(pid, []) if running
-        else
-          @@actions[pid].delete(event)
-          @@handler.register_process(pid, @@actions[pid].keys) if running
-        end
+        @@actions[pid].delete(event)
+        @@handler.register_process(pid, @@actions[pid].keys) if running
+        @@actions.delete(pid) if @@actions[pid].empty?
       end
     end
     
@@ -92,6 +88,7 @@ module God
           end
           
           ::Process.kill('KILL', pid)
+          ::Process.waitpid(pid)
           
           sleep(0.1)
           
@@ -108,4 +105,4 @@ module God
     end
     
   end
-end
+end

data/lib/god/logger.rb

@@ -58,21 +58,27 @@ module God
     def log(watch, level, text)
       # initialize watch log if necessary
       self.logs[watch.name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT) if watch
-      
+
       # push onto capture and timeline for the given watch
-      @templogio.truncate(0)
-      @templogio.rewind
-      @templog.send(level, text % [])
-      @mutex.synchronize do
-        @capture.puts(@templogio.string.dup) if @capture
-        if watch && (Time.now - @spool < 2)
-          self.logs[watch.name] << [Time.now, @templogio.string.dup]
+      if @capture || (watch && (Time.now - @spool < 2))
+        @mutex.synchronize do
+          @templogio.truncate(0)
+          @templogio.rewind
+          @templog.send(level, text)
+
+          message = @templogio.string.dup
+
+          if @capture
+            @capture.puts(message)
+          else
+            self.logs[watch.name] << [Time.now, message]
+          end
         end
       end
-      
+
       # send to regular logger
-      self.send(level, text % [])
-      
+      self.send(level, text)
+
       # send to syslog
       Syslog.send(SYSLOG_EQUIVALENTS[level], text) if Logger.syslog
     end
@@ -114,7 +120,7 @@ module God
     # Returns String
     def finish_capture
       @mutex.synchronize do
-        cap = @capture.string
+        cap = @capture.string if @capture
         @capture = nil
         cap
       end

data/lib/god/task.rb

@@ -144,7 +144,7 @@ module God
     #
     # Returns Task (self)
     def move(to_state)
-      if Thread.current != self.driver.thread
+      if !self.driver.in_driver_context?
         # called from outside Driver
         
         # send an async message to Driver
@@ -235,7 +235,7 @@ module God
     #
     # Returns Task (self)
     def action(a, c = nil)
-      if Thread.current != self.driver.thread
+      if !self.driver.in_driver_context?
         # called from outside Driver
         
         # send an async message to Driver
@@ -299,7 +299,7 @@ module God
     end
     
     def unregister!
-      # override if necessary
+      driver.shutdown
     end
     
     ###########################################################################

data/lib/god/watch.rb

@@ -104,7 +104,7 @@ module God
     ###########################################################################
     
     def action(a, c = nil)
-      if Thread.current != self.driver.thread
+      if !self.driver.in_driver_context?
         # called from outside Driver
         
         # send an async message to Driver
@@ -177,6 +177,7 @@ module God
     
     def unregister!
       God.registry.remove(@process)
+      super
     end
   end
   

data/test/helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
 God::EventHandler.load
 

data/test/test_task.rb

@@ -61,20 +61,20 @@ class TestTask < Test::Unit::TestCase
   
   def test_action_should_send_string_commands_to_system
     @task.foo = 'foo'
-    Thread.current.stubs(:==).returns(true)
+    @task.driver.stubs(:in_driver_context?).returns(true)
     @task.expects(:system).with('foo')
     @task.action(:foo, nil)
   end
   
   def test_action_should_call_lambda_commands
     @task.foo = lambda { }
-    Thread.current.stubs(:==).returns(true)
+    @task.driver.stubs(:in_driver_context?).returns(true)
     @task.foo.expects(:call)
     @task.action(:foo, nil)
   end
   
   def test_action_should_raise_not_implemented_on_non_string_or_lambda_action
-    Thread.current.stubs(:==).returns(true)
+    @task.driver.stubs(:in_driver_context?).returns(true)
     assert_raise NotImplementedError do
       @task.foo = 7
       @task.action(:foo, nil)

data/test/test_watch.rb

@@ -126,7 +126,7 @@ class TestWatch < Test::Unit::TestCase
   # move
   
   def test_move_should_not_clean_up_if_from_state_is_nil
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     metric = nil
@@ -147,7 +147,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_move_should_clean_up_from_state_if_not_nil
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     metric = nil
@@ -170,7 +170,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_move_should_call_action
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     @watch.expects(:action).with(:start)
@@ -179,7 +179,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_move_should_move_to_up_state_if_no_start_or_restart_metric
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     [:start, :restart].each do |state|
@@ -190,7 +190,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_move_should_enable_destination_metric
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     metric = nil
@@ -213,7 +213,7 @@ class TestWatch < Test::Unit::TestCase
   # action
   
   def test_action_should_pass_start_and_stop_actions_to_call_action
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     c = Conditions::FakePollCondition.new
@@ -224,7 +224,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_action_should_do_stop_then_start_if_no_restart_command
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     c = Conditions::FakePollCondition.new
@@ -234,7 +234,7 @@ class TestWatch < Test::Unit::TestCase
   end
   
   def test_action_should_restart_to_call_action_if_present
-    Thread.current.stubs(:==).returns(true)
+    @watch.driver.stubs(:in_driver_context?).returns(true)
     @watch.driver.expects(:message).never
     
     @watch.restart = lambda { }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.22
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: god
 dependencies: []
 
@@ -19,6 +19,7 @@ executables:
 - god
 extensions: 
 - ext/god/extconf.rb
+- ext/god/extconf.rb
 extra_rdoc_files: 
 - README.txt
 files: