god 0.6.0 → 0.7.0

data/lib/god/timeline.rb

@@ -1,36 +1,25 @@
 module God
+  
+  class Timeline < Array
+    # Instantiate a new Timeline
+    #   +max_size+ is the maximum size to which the timeline should grow
+    #
+    # Returns Timeline
+    def initialize(max_size)
+      super()
+      @max_size = max_size
+    end
     
-    class Timeline < Array
-      def initialize(max_size)
-        super()
-        @max_size = max_size
-      end
-      
-      # Push a value onto the Timeline
-      # 
-      # Implementation explanation:
-      # A performance optimization appears here to speed up the push time.
-      # In essence, the code does this:
-      #
-      #   def push(val)
-      #     super(val)
-      #     shift if size > @max_size
-      #   end
-      #
-      # But that's super slow due to the shift, so we resort to reverse! and pop
-      # which gives us a 2x speedup with 100 elements and a 6x speedup with 1000
-      def push(val)
-        if (size + 1) > @max_size
-          reverse!
-          pop
-          reverse!
-        end
-        super(val)
-      end
-      
-      def <<(val)
-        push(val)
-      end
+    # Push a value onto the Timeline
+    #   +val+ is the value to push
+    #
+    # Returns Timeline
+    def push(val)
+      self.concat([val])
+      shift if size > @max_size
     end
     
+    alias_method :<<, :push
+  end
+  
 end

data/lib/god/watch.rb

@@ -13,7 +13,7 @@ module God
     extend Forwardable
     def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart,
                               :name=, :uid=, :gid=, :start=, :stop=, :restart=,
-                              :pid_file, :pid_file=, :log, :log=, :alive?    
+                              :pid_file, :pid_file=, :log, :log=, :alive?, :pid
     # 
     def initialize
       super
@@ -97,22 +97,33 @@ module God
     ###########################################################################
     
     def action(a, c = nil)
-      case a
-      when :start
-        call_action(c, :start)
-        sleep(self.start_grace + self.grace)
-      when :restart
-        if self.restart
-          call_action(c, :restart)
-        else
-          action(:stop, c)
-          action(:start, c)
+      if Thread.current != self.driver.thread
+        # called from outside Driver
+        
+        # send an async message to Driver
+        self.driver.message(:action, [a, c])
+      else
+        # called from within Driver
+        
+        case a
+        when :start
+          call_action(c, :start)
+          sleep(self.start_grace + self.grace)
+        when :restart
+          if self.restart
+            call_action(c, :restart)
+          else
+            action(:stop, c)
+            action(:start, c)
+          end
+          sleep(self.restart_grace + self.grace)
+        when :stop
+          call_action(c, :stop)
+          sleep(self.stop_grace + self.grace)
         end
-        sleep(self.restart_grace + self.grace)
-      when :stop
-        call_action(c, :stop)
-        sleep(self.stop_grace + self.grace)
       end
+      
+      self
     end
     
     def call_action(condition, action)

data/test/configs/child_events/child_events.god

@@ -1,8 +1,3 @@
-module God
-  module Behaviors
-  end
-end
-
 God.watch do |w|
   w.name = "child-events"
   w.interval = 5.seconds

data/test/configs/child_polls/simple_server.rb

@@ -8,5 +8,5 @@ loop do
   
   100000.times { data << 'x' }
   
-  sleep 0.1
+  sleep 10
 end

data/test/configs/daemon_events/simple_server_stop.rb

@@ -1,3 +1,5 @@
+# exit!(2)
+
 3.times do
   puts 'waiting'
   sleep 1

data/test/configs/stress/stress.god

@@ -1,4 +1,4 @@
-('01'..'20').each do |i|
+('01'..'40').each do |i|
   God.watch do |w|
     w.name = "stress-#{i}"
     w.start = "ruby " + File.join(File.dirname(__FILE__), *%w[simple_server.rb])

data/test/configs/test.rb

@@ -1,46 +1,21 @@
-if $0 == __FILE__
-  require File.join(File.dirname(__FILE__), *%w[.. .. lib god])
-end
-
 ENV['GOD_TEST_RAILS_ROOT'] || abort("Set a rails root for testing in an environment variable called GOD_TEST_RAILS_ROOT")
 
 RAILS_ROOT = ENV['GOD_TEST_RAILS_ROOT']
 
-God.init do |g|
-  # g.host = 
-  # g.port = 7777
-  # g.pid_file_directory = 
-end
-
-class SimpleNotifier
-  def self.notify(str)
-    puts "Notifying: #{str}"
-  end
-end
+port = 5000
 
 God.watch do |w|
-  w.name = "local-3000"
+  w.name = "local-#{port}"
   w.interval = 5.seconds
-  w.start = "mongrel_rails start -P ./log/mongrel.pid -c #{RAILS_ROOT} -p 3001 -d"
+  w.start = "mongrel_rails start -P ./log/mongrel.pid -c #{RAILS_ROOT} -p #{port} -d"
   w.restart = "mongrel_rails restart -P ./log/mongrel.pid -c #{RAILS_ROOT}"
   w.stop = "mongrel_rails stop -P ./log/mongrel.pid -c #{RAILS_ROOT}"
-  w.restart_grace = 5.seconds
-  w.stop_grace = 5.seconds
-  w.autostart = true
-  w.uid = 'kev'
-  w.gid = 'kev'
   w.group = 'mongrels'
   w.pid_file = File.join(RAILS_ROOT, "log/mongrel.pid")
   
   # clean pid files before start if necessary
   w.behavior(:clean_pid_file)
   
-  w.behavior(:notify_when_flapping) do |b|
-    b.failures = 5
-    b.seconds = 60.seconds
-    b.notifier = SimpleNotifier
-  end
-  
   # determine the state on startup
   w.transition(:init, { true => :up, false => :start }) do |on|
     on.condition(:process_running) do |c|
@@ -73,5 +48,14 @@ God.watch do |w|
       c.above = 10.percent
       c.times = [3, 5]
     end
+    
+    on.condition(:http_response_code) do |c|
+      c.host = 'localhost'
+      c.port = port
+      c.path = '/'
+      c.code_is_not = 200
+      c.timeout = 10.seconds
+      c.times = [3, 5]
+    end
   end
 end

data/test/test_condition.rb

@@ -17,6 +17,14 @@ class TestCondition < Test::Unit::TestCase
     end
   end
   
+  def test_generate_should_abort_on_event_condition_without_loaded_event_system
+    God::EventHandler.stubs(:operational?).returns(false)
+    assert_abort do
+      God::EventHandler.start
+      Condition.generate(:process_exits, nil).class
+    end
+  end
+  
   def test_generate_should_return_a_good_error_message_for_invalid_types
     emsg = "No Condition found with the class name God::Conditions::FooBar"
     rmsg = nil

data/test/test_conditions_http_response_code.rb

@@ -40,7 +40,7 @@ class TestHttpResponseCode < Test::Unit::TestCase
   
   def test_test_should_return_false_if_code_is_is_set_to_200_but_response_is_500
     c = valid_condition
-    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :head => stub(:code => 500)))
+    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :get => stub(:code => 500)))
     assert_equal false, c.test
   end
   
@@ -49,13 +49,13 @@ class TestHttpResponseCode < Test::Unit::TestCase
       cc.code_is = nil
       cc.code_is_not = [200]
     end
-    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :head => stub(:code => 200)))
+    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :get => stub(:code => 200)))
     assert_equal false, c.test
   end
   
   def test_test_should_return_true_if_code_is_is_set_to_200_and_response_is_200
     c = valid_condition
-    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :head => stub(:code => 200)))
+    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :get => stub(:code => 200)))
     assert_equal true, c.test
   end
   
@@ -64,7 +64,7 @@ class TestHttpResponseCode < Test::Unit::TestCase
       cc.code_is = nil
       cc.code_is_not = [200]
     end
-    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :head => stub(:code => 500)))
+    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :get => stub(:code => 500)))
     assert_equal true, c.test
   end
   
@@ -102,7 +102,7 @@ class TestHttpResponseCode < Test::Unit::TestCase
     c = valid_condition do |cc|
       cc.times = [2, 2]
     end
-    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :head => stub(:code => 200))).times(2)
+    Net::HTTP.expects(:start).yields(stub(:read_timeout= => nil, :get => stub(:code => 200))).times(2)
     assert_equal false, c.test
     assert_equal true, c.test
   end

data/test/test_conditions_process_running.rb

@@ -6,9 +6,11 @@ class TestConditionsProcessRunning < Test::Unit::TestCase
       c = Conditions::ProcessRunning.new
       c.running = r
     
-      c.stubs(:watch).returns(stub(:pid_file => '', :name => 'foo'))
+      c.stubs(:watch).returns(stub(:pid => 123, :name => 'foo'))
     
-      no_stdout { assert_equal !r, c.test }
+      # no_stdout do
+        assert_equal !r, c.test
+      # end
     end
   end
   
@@ -18,7 +20,7 @@ class TestConditionsProcessRunning < Test::Unit::TestCase
       c.running = r
     
       File.stubs(:exist?).returns(true)
-      c.stubs(:watch).returns(stub(:pid_file => ''))
+      c.stubs(:watch).returns(stub(:pid => 123))
       File.stubs(:read).returns('5')
       System::Process.any_instance.stubs(:exists?).returns(false)
     
@@ -32,7 +34,7 @@ class TestConditionsProcessRunning < Test::Unit::TestCase
       c.running = r
     
       File.stubs(:exist?).returns(true)
-      c.stubs(:watch).returns(stub(:pid_file => ''))
+      c.stubs(:watch).returns(stub(:pid => 123))
       File.stubs(:read).returns('5')
       System::Process.any_instance.stubs(:exists?).returns(true)
     

data/test/test_driver.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestDriver < Test::Unit::TestCase
+  def setup
+    
+  end
+
+  def test_
+    
+  end
+end

data/test/test_event_handler.rb

@@ -70,4 +70,11 @@ class TestEventHandler < Test::Unit::TestCase
     @h.actions = {}
     @h.load
   end
+end
+
+class TestEventHandlerOperational < Test::Unit::TestCase
+  def test_operational
+    God::EventHandler.start
+    assert God::EventHandler.loaded?
+  end
 end

data/test/test_god.rb

@@ -5,11 +5,18 @@ class TestGod < Test::Unit::TestCase
     God::Socket.stubs(:new).returns(true)
     God.stubs(:setup).returns(true)
     God.stubs(:validater).returns(true)
+    Thread.any_instance.stubs(:join).returns(true)
     God.reset
+    God.pid_file_directory = '/var/run/god'
   end
   
   def teardown
-    Timer.get.timer.kill
+    God.main && God.main.kill
+    if God.watches
+      God.watches.each do |k, w|
+        w.driver.thread.kill
+      end
+    end
   end
   
   # applog
@@ -170,7 +177,9 @@ class TestGod < Test::Unit::TestCase
     w = God.watches['bar']
     w.state = :up
     w.expects(:unmonitor)
-    God.unwatch(w)
+    no_stdout do
+      God.unwatch(w)
+    end
   end
   
   def test_unwatch_should_unregister_watch
@@ -239,15 +248,19 @@ class TestGod < Test::Unit::TestCase
   
   def test_contact_should_abort_on_duplicate_contact_name
     God.contact(:fake_contact) { |c| c.name = 'tom' }
-    assert_abort do
-      God.contact(:fake_contact) { |c| c.name = 'tom' }
+    no_stdout do
+      assert_nothing_raised do
+        God.contact(:fake_contact) { |c| c.name = 'tom' }
+      end
     end
   end
   
   def test_contact_should_abort_on_contact_with_same_name_as_group
     God.contact(:fake_contact) { |c| c.name = 'tom'; c.group = 'devs' }
-    assert_abort do
-      God.contact(:fake_contact) { |c| c.name = 'devs' }
+    no_stdout do
+      assert_nothing_raised do
+        God.contact(:fake_contact) { |c| c.name = 'devs' }
+      end
     end
   end
   
@@ -482,15 +495,6 @@ class TestGod < Test::Unit::TestCase
     God::Socket.expects(:new).returns(true)
     God.start
   end
-    
-  def test_start_should_start_event_handler
-    God.watch { |w| w.name = 'foo'; w.start = 'bar' }
-    Timer.any_instance.expects(:join)
-    EventHandler.expects(:start).once
-    no_stdout do
-      God.start
-    end
-  end
   
   def test_start_should_begin_monitoring_autostart_watches
     God.watch do |w|
@@ -498,7 +502,6 @@ class TestGod < Test::Unit::TestCase
       w.start = 'go'
     end
     
-    Timer.any_instance.expects(:join)
     Watch.any_instance.expects(:monitor).once
     God.start
   end
@@ -510,14 +513,12 @@ class TestGod < Test::Unit::TestCase
       w.autostart = false
     end
     
-    Timer.any_instance.expects(:join)
     Watch.any_instance.expects(:monitor).never
     God.start
   end
   
   def test_start_should_get_and_join_timer
     God.watch { |w| w.name = 'foo'; w.start = 'bar' }
-    Timer.any_instance.expects(:join)
     no_stdout do
       God.start
     end
@@ -543,47 +544,47 @@ class TestGod < Test::Unit::TestCase
 end
 
 
-class TestGodOther < Test::Unit::TestCase
-  def setup
-    God::Socket.stubs(:new).returns(true)
-    God.internal_init
-    God.reset
-  end
-  
-  def teardown
-    Timer.get.timer.kill
-  end
-  
-  # setup
-  
-  def test_setup_should_create_pid_file_directory_if_it_doesnt_exist
-    God.expects(:test).returns(false)
-    FileUtils.expects(:mkdir_p).with(God.pid_file_directory)
-    God.setup
-  end
-  
-  def test_setup_should_raise_if_no_permissions_to_create_pid_file_directory
-    God.expects(:test).returns(false)
-    FileUtils.expects(:mkdir_p).raises(Errno::EACCES)
-    
-    assert_abort do
-      God.setup
-    end
-  end
-  
-  # validate
-    
-  def test_validate_should_abort_if_pid_file_directory_is_unwriteable
-    God.expects(:test).returns(false)
-    assert_abort do
-      God.validater
-    end
-  end
-  
-  def test_validate_should_not_abort_if_pid_file_directory_is_writeable
-    God.expects(:test).returns(true)
-    assert_nothing_raised do
-      God.validater
-    end
-  end
-end
+# class TestGodOther < Test::Unit::TestCase
+#   def setup
+#     God::Socket.stubs(:new).returns(true)
+#     God.internal_init
+#     God.reset
+#   end
+#   
+#   def teardown
+#     God.main && God.main.kill
+#   end
+#   
+#   # setup
+#   
+#   def test_setup_should_create_pid_file_directory_if_it_doesnt_exist
+#     God.expects(:test).returns(false)
+#     FileUtils.expects(:mkdir_p).with(God.pid_file_directory)
+#     God.setup
+#   end
+#   
+#   def test_setup_should_raise_if_no_permissions_to_create_pid_file_directory
+#     God.expects(:test).returns(false)
+#     FileUtils.expects(:mkdir_p).raises(Errno::EACCES)
+#     
+#     assert_abort do
+#       God.setup
+#     end
+#   end
+#   
+#   # validate
+#     
+#   def test_validate_should_abort_if_pid_file_directory_is_unwriteable
+#     God.expects(:test).returns(false)
+#     assert_abort do
+#       God.validater
+#     end
+#   end
+#   
+#   def test_validate_should_not_abort_if_pid_file_directory_is_writeable
+#     God.expects(:test).returns(true)
+#     assert_nothing_raised do
+#       God.validater
+#     end
+#   end
+# end