god 0.5.0 → 0.6.0

data/lib/god/task.rb

@@ -40,19 +40,19 @@ module God
       # a name must be specified
       if self.name.nil?
         valid = false
-        LOG.log(self, :error, "No name was specified")
+        applog(self, :error, "No name was specified")
       end
       
       # valid_states must be specified
       if self.valid_states.nil?
         valid = false
-        LOG.log(self, :error, "No valid_states array was specified")
+        applog(self, :error, "No valid_states array was specified")
       end
       
       # valid_states must be specified
       if self.initial_state.nil?
         valid = false
-        LOG.log(self, :error, "No initial_state was specified")
+        applog(self, :error, "No initial_state was specified")
       end
       
       valid
@@ -132,8 +132,7 @@ module God
         from_state = self.state
         
         msg = "#{self.name} move '#{from_state}' to '#{to_state}'"
-        Syslog.debug(msg)
-        LOG.log(self, :info, msg)
+        applog(self, :info, msg)
         
         # cleanup from current state
         self.metrics[from_state].each { |m| m.disable }
@@ -199,14 +198,12 @@ module God
         case command
           when String
             msg = "#{self.name} #{a}: #{command}"
-            Syslog.debug(msg)
-            LOG.log(self, :info, msg)
+            applog(self, :info, msg)
             
             system(command)
           when Proc
             msg = "#{self.name} #{a}: lambda"
-            Syslog.debug(msg)
-            LOG.log(self, :info, msg)
+            applog(self, :info, msg)
             
             command.call
           else

data/lib/god/timer.rb

@@ -31,23 +31,30 @@ module God
       
       @timer = Thread.new do
         loop do
-          # get the current time
-          t = Time.now.to_i
+          begin
+            # get the current time
+            t = Time.now.to_i
           
-          # iterate over each event and trigger any that are due
-          @events.each do |event|
-            if t >= event.at
-              self.trigger(event)
-              @mutex.synchronize do
-                @events.delete(event)
+            # iterate over each event and trigger any that are due
+            @events.each do |event|
+              if t >= event.at
+                self.trigger(event)
+                @mutex.synchronize do
+                  @events.delete(event)
+                end
+              else
+                break
               end
-            else
-              break
             end
-          end
           
-          # sleep until next check
-          sleep INTERVAL
+            # sleep until next check
+            sleep INTERVAL
+          rescue Exception => e
+            message = format("Unhandled exception (%s): %s\n%s",
+                             e.class, e.message, e.backtrace.join("\n"))
+            applog(nil, :fatal, message)
+            sleep INTERVAL
+          end
         end
       end
     end

data/lib/god/watch.rb

@@ -123,16 +123,14 @@ module God
         info = b.send("before_#{action}")
         if info
           msg = "#{self.name} before_#{action}: #{info} (#{b.base_name})"
-          Syslog.debug(msg)
-          LOG.log(self, :info, msg)
+          applog(self, :info, msg)
         end
       end
       
       # log
       if self.send(action)
         msg = "#{self.name} #{action}: #{self.send(action).to_s}"
-        Syslog.debug(msg)
-        LOG.log(self, :info, msg)
+        applog(self, :info, msg)
       end
       
       @process.call_action(action)
@@ -144,8 +142,7 @@ module God
         info = b.send("after_#{action}")
         if info
           msg = "#{self.name} after_#{action}: #{info} (#{b.base_name})"
-          Syslog.debug(msg)
-          LOG.log(self, :info, msg)
+          applog(self, :info, msg)
         end
       end
     end

data/test/configs/child_events/child_events.god

@@ -7,7 +7,7 @@ God.watch do |w|
   w.name = "child-events"
   w.interval = 5.seconds
   w.start = File.join(GOD_ROOT, *%w[test configs child_events simple_server.rb])
-  w.log = File.join(GOD_ROOT, *%w[test configs child_events god.log])
+  # w.log = File.join(GOD_ROOT, *%w[test configs child_events god.log])
   
   # determine the state on startup
   w.transition(:init, { true => :up, false => :start }) do |on|

data/test/configs/complex/complex.god

@@ -0,0 +1,59 @@
+God.watch do |w|
+  w.name = "complex"
+  w.interval = 5.seconds
+  w.start = File.join(GOD_ROOT, *%w[test configs complex simple_server.rb])
+  # w.log = File.join(GOD_ROOT, *%w[test configs child_events god.log])
+  
+  # determine the state on startup
+  w.transition(:init, { true => :up, false => :start }) do |on|
+    on.condition(:process_running) do |c|
+      c.running = true
+    end
+  end
+  
+  # determine when process has finished starting
+  w.transition([:start, :restart], :up) do |on|
+    on.condition(:process_running) do |c|
+      c.running = true
+    end
+    
+    # failsafe
+    on.condition(:tries) do |c|
+      c.times = 2
+      c.transition = :start
+    end
+  end
+
+  # start if process is not running
+  w.transition(:up, :start) do |on|
+    on.condition(:process_exits)
+  end
+  
+  # restart if process is misbehaving
+  w.transition(:up, :restart) do |on|
+    on.condition(:complex) do |cc|
+      cc.and(:cpu_usage) do |c|
+        c.above = 0.percent
+        c.times = 1
+      end
+      
+      cc.and(:memory_usage) do |c|
+        c.above = 0.megabytes
+        c.times = 3
+      end
+    end
+  end
+  
+  # lifecycle
+  w.lifecycle do |on|
+    on.condition(:flapping) do |c|
+      c.to_state = [:start, :restart]
+      c.times = 5
+      c.within = 20.seconds
+      c.transition = :unmonitored
+      c.retry_in = 10.seconds
+      c.retry_times = 2
+      c.retry_within = 5.minutes
+    end
+  end
+end

data/test/configs/complex/simple_server.rb

@@ -0,0 +1,3 @@
+#! /usr/bin/env ruby
+
+loop { puts 'server'; sleep 1 }

data/test/test_conditions_disk_usage.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConditionsDiskUsage < Test::Unit::TestCase
+  # valid?
+  
+  def test_valid_should_return_false_if_no_above_given
+    c = Conditions::DiskUsage.new
+    c.mount_point = '/'
+    c.watch = stub(:name => 'foo')
+    
+    no_stdout do
+      assert_equal false, c.valid?
+    end
+  end
+  
+  def test_valid_should_return_false_if_no_mount_point_given
+    c = Conditions::DiskUsage.new
+    c.above = 90
+    c.watch = stub(:name => 'foo')
+    
+    no_stdout do
+      assert_equal false, c.valid?
+    end
+  end
+  
+  def test_valid_should_return_true_if_required_options_all_set
+    c = Conditions::DiskUsage.new
+    c.above = 90
+    c.mount_point = '/'
+    c.watch = stub(:name => 'foo')
+    
+    assert_equal true, c.valid?
+  end
+  
+  # test
+  
+  def test_test_should_return_true_if_above_limit
+    c = Conditions::DiskUsage.new
+    c.above = 90
+    c.mount_point = '/'
+    
+    c.expects(:`).returns('91')
+    
+    assert_equal true, c.test
+  end
+  
+  def test_test_should_return_false_if_below_limit
+    c = Conditions::DiskUsage.new
+    c.above = 90
+    c.mount_point = '/'
+    
+    c.expects(:`).returns('90')
+    
+    assert_equal false, c.test
+  end
+end

data/test/test_conditions_http_response_code.rb

@@ -36,27 +36,6 @@ class TestHttpResponseCode < Test::Unit::TestCase
     no_stdout { assert !c.valid? }
   end
   
-  def test_valid_should_return_false_if_no_port_set
-    c = valid_condition do |cc|
-      cc.port = nil
-    end
-    no_stdout { assert !c.valid? }
-  end
-  
-  def test_valid_should_return_false_if_no_path_set
-    c = valid_condition do |cc|
-      cc.path = nil
-    end
-    no_stdout { assert !c.valid? }
-  end
-  
-  def test_valid_should_return_false_if_no_timeout_set
-    c = valid_condition do |cc|
-      cc.timeout = nil
-    end
-    no_stdout { assert !c.valid? }
-  end
-  
   # test
   
   def test_test_should_return_false_if_code_is_is_set_to_200_but_response_is_500
@@ -104,6 +83,21 @@ class TestHttpResponseCode < Test::Unit::TestCase
     assert_equal true, c.test
   end
   
+  def test_test_should_return_false_if_code_is_is_set_to_200_but_cant_connect
+    c = valid_condition
+    Net::HTTP.expects(:start).raises(Errno::ECONNREFUSED, '')
+    assert_equal false, c.test
+  end
+  
+  def test_test_should_return_true_if_code_is_not_is_set_to_200_and_cant_connect
+    c = valid_condition do |cc|
+      cc.code_is = nil
+      cc.code_is_not = [200]
+    end
+    Net::HTTP.expects(:start).raises(Errno::ECONNREFUSED, '')
+    assert_equal true, c.test
+  end
+  
   def test_test_should_return_true_if_code_is_is_set_to_200_and_response_is_200_twice_for_times_two_of_two
     c = valid_condition do |cc|
       cc.times = [2, 2]

data/test/test_god.rb

@@ -12,6 +12,13 @@ class TestGod < Test::Unit::TestCase
     Timer.get.timer.kill
   end
   
+  # applog
+  
+  def test_applog
+    LOG.expects(:log).with(nil, :debug, 'foo')
+    applog(nil, :debug, 'foo')
+  end
+  
   # internal_init
   
   def test_init_should_initialize_watches_to_empty_array
@@ -297,6 +304,15 @@ class TestGod < Test::Unit::TestCase
     God.control('foo', 'unmonitor')
   end
   
+  def test_control_should_unwatch_on_remove
+    God.watch { |w| w.name = 'foo'; w.start = 'bar' }
+    
+    w = God.watches['foo']
+    w.state = :up
+    God.expects(:unwatch)
+    God.control('foo', 'remove')
+  end
+  
   def test_control_should_raise_on_invalid_command
     God.watch { |w| w.name = 'foo'; w.start = 'bar' }
     
@@ -329,6 +345,15 @@ class TestGod < Test::Unit::TestCase
   # terminate
   
   def test_terminate_should_exit
+    God.pid = nil
+    FileUtils.expects(:rm_f).never
+    God.expects(:exit!)
+    God.terminate
+  end
+  
+  def test_terminate_should_delete_pid
+    God.pid = '/foo/bar'
+    FileUtils.expects(:rm_f).with("/foo/bar")
     God.expects(:exit!)
     God.terminate
   end
@@ -504,6 +529,17 @@ class TestGod < Test::Unit::TestCase
     God.expects(:start).once
     God.at_exit
   end
+  
+  # pattern_match
+  
+  def test_pattern_match
+    list = %w{ mongrel-3000 mongrel-3001 fuzed fuzed2 apache mysql}
+    
+    assert_equal %w{ mongrel-3000 }, God.pattern_match('m3000', list)
+    assert_equal %w{ mongrel-3001 }, God.pattern_match('m31', list)
+    assert_equal %w{ fuzed fuzed2 }, God.pattern_match('fu', list)
+    assert_equal %w{ mysql }, God.pattern_match('sql', list)
+  end
 end
 
 

data/test/test_hub.rb

@@ -125,7 +125,7 @@ class TestHub < Test::Unit::TestCase
     end
   end
   
-  def test_handle_poll_should_abort_on_exception
+  def test_handle_poll_should_not_abort_on_exception
     c = Conditions::FakePollCondition.new
     c.interval = 10
     
@@ -134,9 +134,11 @@ class TestHub < Test::Unit::TestCase
     
     c.expects(:test).raises(StandardError.new)
     
-    assert_abort do
-      t = Hub.handle_poll(c)
-      t.join
+    assert_nothing_raised do
+      no_stdout do
+        t = Hub.handle_poll(c)
+        t.join
+      end
     end
   end
   

data/test/test_logger.rb

@@ -19,6 +19,14 @@ class TestLogger < Test::Unit::TestCase
     assert_match(/qux/, @log.logs['foo'][0][1])
   end
   
+  def test_log_should_send_to_syslog
+    Syslog.expects(:crit).with('foo')
+    
+    no_stdout do
+      @log.log(stub(:name => 'foo'), :fatal, "foo")
+    end
+  end
+  
   # watch_log_since
   
   def test_watch_log_since

data/test/test_timer.rb

@@ -51,6 +51,15 @@ class TestTimer < Test::Unit::TestCase
     assert_equal 1, @t.events.size
   end
   
+  def test_time_should_recover_from_exceptions
+    @t.expects(:trigger).raises(Exception.new)
+    no_stdout do
+      @t.schedule(stub(:interval => 0))
+      sleep(0.3)
+      @t.schedule(stub(:interval => 0))
+    end
+  end
+  
   # join
   
   def test_join_should_join

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-10-05 00:00:00 -07:00
+  version: 0.6.0
+date: 2007-12-04 00:00:00 -08:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - bin/god
 - examples/events.god
 - examples/gravatar.god
+- examples/single.god
 - ext/god/extconf.rb
 - ext/god/kqueue_handler.c
 - ext/god/netlink_handler.c
@@ -45,10 +46,15 @@ files:
 - lib/god/behavior.rb
 - lib/god/behaviors/clean_pid_file.rb
 - lib/god/behaviors/notify_when_flapping.rb
+- lib/god/cli/command.rb
+- lib/god/cli/run.rb
+- lib/god/cli/version.rb
 - lib/god/condition.rb
 - lib/god/conditions/always.rb
+- lib/god/conditions/complex.rb
 - lib/god/conditions/cpu_usage.rb
 - lib/god/conditions/degrading_lambda.rb
+- lib/god/conditions/disk_usage.rb
 - lib/god/conditions/flapping.rb
 - lib/god/conditions/http_response_code.rb
 - lib/god/conditions/lambda.rb
@@ -82,6 +88,8 @@ files:
 - test/configs/child_events/simple_server.rb
 - test/configs/child_polls/child_polls.god
 - test/configs/child_polls/simple_server.rb
+- test/configs/complex/complex.god
+- test/configs/complex/simple_server.rb
 - test/configs/contact/contact.god
 - test/configs/contact/simple_server.rb
 - test/configs/daemon_events/daemon_events.god
@@ -102,6 +110,7 @@ files:
 - test/suite.rb
 - test/test_behavior.rb
 - test/test_condition.rb
+- test/test_conditions_disk_usage.rb
 - test/test_conditions_http_response_code.rb
 - test/test_conditions_process_running.rb
 - test/test_conditions_tries.rb
@@ -126,6 +135,7 @@ files:
 test_files: 
 - test/test_behavior.rb
 - test/test_condition.rb
+- test/test_conditions_disk_usage.rb
 - test/test_conditions_http_response_code.rb
 - test/test_conditions_process_running.rb
 - test/test_conditions_tries.rb