god 0.3.0 → 0.4.0

data/lib/god/registry.rb

@@ -13,6 +13,10 @@ module God
       @storage[item.name] = item
     end
     
+    def remove(item)
+      @storage.delete(item.name)
+    end
+    
     def size
       @storage.size
     end

data/lib/god/server.rb

@@ -1,4 +1,5 @@
 require 'drb'
+require 'drb/acl'
 
 # The God::Server oversees the DRb server which dishes out info on this God daemon.
 
@@ -7,12 +8,18 @@ module God
   class Server
     attr_reader :host, :port
 
-    def initialize(host = nil, port = nil)
+    def initialize(host = nil, port = nil, allow = [])
       @host = host
-      @port = port || 17165
+      @port = port
+      @acl = %w{deny all} + allow.inject([]) { |acc, a| acc + ['allow', a] }
+      puts "Starting on #{@host}:#{@port}"
       start
     end
 
+    def ping
+      true
+    end
+    
     def method_missing(*args, &block)
       God.send(*args, &block)
     end
@@ -20,6 +27,9 @@ module God
     private
 
     def start
+      acl = ACL.new(@acl)
+      DRb.install_acl(acl)
+      
       @drb ||= DRb.start_service("druby://#{@host}:#{@port}", self) 
     end
   end

data/lib/god/timeline.rb

@@ -0,0 +1,36 @@
+module God
+    
+    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
+    end
+    
+end

data/lib/god/watch.rb

@@ -17,7 +17,7 @@ module God
     extend Forwardable
     def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart,
                               :name=, :uid=, :gid=, :start=, :stop=, :restart=,
-                              :pid_file, :pid_file=
+                              :pid_file, :pid_file=, :log, :log=, :alive?
     
     # api
     attr_accessor :behaviors, :metrics
@@ -46,6 +46,16 @@ module God
       self.mutex = Mutex.new
     end
     
+    def valid?
+      @process.valid?
+    end
+    
+    ###########################################################################
+    #
+    # Behavior
+    #
+    ###########################################################################
+    
     def behavior(kind)
       # create the behavior
       begin
@@ -136,7 +146,7 @@ module God
     def move(to_state)
       msg = "#{self.name} move '#{self.state}' to '#{to_state}'"
       Syslog.debug(msg)
-      puts msg
+      LOG.log(self, :info, msg)
        
       # cleanup from current state
       from_state = self.state
@@ -167,14 +177,16 @@ module God
     def action(a, c = nil)
       case a
       when :start
-        Syslog.debug(self.start.to_s)
-        puts self.start.to_s
+        msg = "#{self.name} start: #{self.start.to_s}"
+        Syslog.debug(msg)
+        LOG.log(self, :info, msg)
         call_action(c, :start)
         sleep(self.start_grace + self.grace)
       when :restart
         if self.restart
-          Syslog.debug(self.restart.to_s)
-          puts self.restart
+          msg = "#{self.name} restart: #{self.restart.to_s}"
+          Syslog.debug(msg)
+          LOG.log(self, :info, msg)
           call_action(c, :restart)
         else
           action(:stop, c)
@@ -182,8 +194,11 @@ module God
         end
         sleep(self.restart_grace + self.grace)
       when :stop
-        Syslog.debug(self.stop.to_s)
-        puts self.stop.to_s
+        if self.stop
+          msg = "#{self.name} stop: #{self.stop.to_s}"
+          Syslog.debug(msg)
+          LOG.log(self, :info, msg)
+        end
         call_action(c, :stop)
         sleep(self.stop_grace + self.grace)
       end      
@@ -210,6 +225,10 @@ module God
     def register!
       God.registry.add(@process)
     end
+    
+    def unregister!
+      God.registry.remove(@process)
+    end
   end
   
 end

data/test/configs/child_events/child_events.god

@@ -2,7 +2,6 @@ God.watch do |w|
   w.name = "child-events"
   w.interval = 5.seconds
   w.start = File.join(File.dirname(__FILE__), *%w[simple_server.rb])
-  w.stop = ""
   
   # determine the state on startup
   w.transition(:init, { true => :up, false => :start }) do |on|
@@ -12,10 +11,16 @@ God.watch do |w|
   end
   
   # determine when process has finished starting
-  w.transition(:start, :up) do |on|
+  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

data/test/configs/child_polls/child_polls.god

@@ -1,11 +1,13 @@
 God.watch do |w|
   w.name = 'child-polls'
   w.start = File.join(File.dirname(__FILE__), *%w[simple_server.rb])
-  w.stop = ''
+  # w.stop = ''
   w.interval = 5
   w.grace = 2
   w.uid = 'tom'
   w.gid = 'tom'
+  w.group = 'test'
+  w.log = File.join(File.dirname(__FILE__), *%w[out.log])
   
   w.start_if do |start|
     start.condition(:process_running) do |c|

data/test/configs/child_polls/simple_server.rb

@@ -1,3 +1,3 @@
 #! /usr/bin/env ruby
 
-loop { puts 'server'; sleep 1 }
+loop { STDOUT.puts('server'); STDOUT.flush; sleep 1 }

data/test/configs/daemon_events/daemon_events.god

@@ -3,8 +3,6 @@ God.watch do |w|
   w.interval = 5.seconds
   w.start = '/usr/local/bin/ruby ' + File.join(File.dirname(__FILE__), *%w[simple_server.rb]) + ' start'
   w.stop = '/usr/local/bin/ruby ' + File.join(File.dirname(__FILE__), *%w[simple_server.rb]) + ' stop'
-  w.uid = 'tom'
-  w.gid = 'tom'
   w.pid_file = '/var/run/daemon-events.pid'
   
   w.behavior(:clean_pid_file)
@@ -17,10 +15,16 @@ God.watch do |w|
   end
   
   # determine when process has finished starting
-  w.transition(:start, :up) do |on|
+  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

data/test/configs/daemon_polls/daemon_polls.god

@@ -0,0 +1,17 @@
+God.watch do |w|
+  w.name = "daemon-polls"
+  w.interval = 5.seconds
+  w.start = 'ruby ' + File.join(File.dirname(__FILE__), *%w[simple_server.rb]) + ' start'
+  w.stop = 'ruby ' + File.join(File.dirname(__FILE__), *%w[simple_server.rb]) + ' stop'
+  w.pid_file = '/var/run/daemon-polls.pid'
+  w.start_grace = 2.seconds
+  w.log = File.join(File.dirname(__FILE__), *%w[out.log])
+  
+  w.behavior(:clean_pid_file)
+  
+  w.start_if do |start|
+    start.condition(:process_running) do |c|
+      c.running = false
+    end
+  end
+end

data/test/configs/daemon_polls/simple_server.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'daemons'
+
+Daemons.run_proc('daemon-polls', {:dir_mode => :system}) do
+  loop { STDOUT.puts('server'); STDOUT.flush; sleep 1 }
+end

data/test/configs/degrading_lambda/degrading_lambda.god

@@ -0,0 +1,33 @@
+God.watch do |w|
+  w.name = 'degrading-lambda'
+  w.start = File.join(File.dirname(__FILE__), *%w[tcp_server.rb])
+  w.interval = 5
+  w.grace = 2
+  w.uid = 'kev'
+  w.gid = 'kev'
+  w.group = 'test'
+  
+  w.start_if do |start|
+    start.condition(:process_running) do |c|
+      c.running = false
+    end
+  end
+  
+  w.restart_if do |restart|
+    restart.condition(:degrading_lambda) do |c|
+      require 'socket'
+      c.lambda = lambda {
+        begin
+          sock = TCPSocket.open('127.0.0.1', 9090)
+          sock.send "2\n", 0
+          retval = sock.gets
+          puts "Retval is #{retval}"
+          sock.close
+          retval
+        rescue
+          false
+        end
+      }
+    end
+  end
+end

data/test/configs/degrading_lambda/tcp_server.rb

@@ -0,0 +1,15 @@
+#! /usr/bin/env ruby
+
+require 'socket'
+server = TCPServer.new('127.0.0.1', 9090)
+while (session = server.accept)
+  puts "Found a session"
+  request = session.gets
+  puts "Request: #{request}"
+  time = request.to_i
+  puts "Sleeping for #{time}"
+  sleep time
+  session.print "Slept for #{time} seconds"
+  session.close
+  puts "Session closed"
+end

data/test/configs/real.rb

@@ -17,7 +17,7 @@ God.watch do |w|
   w.behavior(:clean_pid_file) do |b|
     b.pid_file = pid_file
   end
-
+  
   # start if process is not running
   w.start_if do |start|
     start.condition(:process_running) do |c|

data/test/configs/running_load/running_load.god

@@ -0,0 +1,16 @@
+God.watch do |w|
+  w.name = 'running-load'
+  w.start = '/Users/tom/dev/god/test/configs/child_polls/simple_server.rb'
+  w.stop = ''
+  w.interval = 5
+  w.grace = 2
+  w.uid = 'tom'
+  w.gid = 'tom'
+  w.group = 'test'
+  
+  w.start_if do |start|
+    start.condition(:process_running) do |c|
+      c.running = false
+    end
+  end
+end

data/test/configs/stress/simple_server.rb

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

data/test/configs/stress/stress.god

@@ -0,0 +1,15 @@
+('01'..'20').each do |i|
+  God.watch do |w|
+    w.name = "stress-#{i}"
+    w.start = "ruby " + File.join(File.dirname(__FILE__), *%w[simple_server.rb])
+    w.interval = 1
+    w.grace = 2
+    w.group = 'test'
+  
+    w.start_if do |start|
+      start.condition(:process_running) do |c|
+        c.running = false
+      end
+    end
+  end
+end

data/test/configs/test.rb

@@ -12,6 +12,12 @@ God.init do |g|
   # g.pid_file_directory = 
 end
 
+class SimpleNotifier
+  def self.notify(str)
+    puts "Notifying: #{str}"
+  end
+end
+
 God.watch do |w|
   w.name = "local-3000"
   w.interval = 5.seconds
@@ -21,14 +27,20 @@ God.watch do |w|
   w.restart_grace = 5.seconds
   w.stop_grace = 5.seconds
   w.autostart = true
-  w.uid = 'tom'
-  w.gid = 'tom'
+  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|

data/test/helper.rb

@@ -3,6 +3,18 @@ require File.join(File.dirname(__FILE__), *%w[.. lib god])
 require 'test/unit'
 require 'set'
 
+include God
+
+if RUBY_PLATFORM =~ /linux/i && Process.uid != 0
+  abort <<-EOF
+*********************************************************************
+*                                                                   *
+*    You need to run these tests as root (netlink requires it)      *
+*                                                                   *
+*********************************************************************
+EOF
+end
+
 begin
   require 'mocha'
 rescue LoadError
@@ -15,8 +27,6 @@ rescue LoadError
   end
 end
 
-include God
-
 module God
   module Conditions
     class FakeCondition < Condition

data/test/test_conditions_tries.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConditionsTries < Test::Unit::TestCase
+  def setup
+    @c = Conditions::Tries.new
+    @c.times = 3
+    @c.prepare
+  end
+  
+  def test_prepare_should_create_timeline
+    assert 3, @c.instance_variable_get(:@timeline).instance_variable_get(:@max_size)
+  end
+  
+  def test_test_should_return_true_if_called_three_times_within_one_second
+    assert !@c.test
+    assert !@c.test
+    assert @c.test
+  end
+  
+  def test_test_should_return_false_on_fourth_call_if_called_three_times_within_one_second
+    3.times { @c.test }
+    assert !@c.test
+  end
+end
+
+class TestConditionsTriesWithin < Test::Unit::TestCase
+  def setup
+    @c = Conditions::Tries.new
+    @c.times = 3
+    @c.within = 1.seconds
+    @c.prepare
+  end
+  
+  def test_test_should_return_true_if_called_three_times_within_one_second
+    assert !@c.test
+    assert !@c.test
+    assert @c.test
+  end
+  
+  def test_test_should_return_false_if_called_three_times_within_two_seconds
+    assert !@c.test
+    assert !@c.test
+    assert sleep(1.1)
+    assert !@c.test
+  end
+end