magistrate 0.2.1 → 0.5.0

data/README.md

@@ -23,7 +23,7 @@ If you're using capistrano, then the tmp/pids directory is persisted across depl
 
 Your user-space cron job should look like this:
 
-*/5 0 0 0 0 magistrate run --config ~/my_app/current/config/magistrate.yml
+* 0 0 0 0 magistrate run --config ~/my_app/current/config/magistrate.yml
 
 ### What if the server is down?
 

data/bin/magistrate

@@ -41,7 +41,7 @@ ARGV.options do |opts|
   end
 end
 
-config_file ||= File.join('config', 'magistrate.yaml')
+config_file ||= File.join('config', 'magistrate.yml')
 
 ARGV[0] ||= 'run'
 

data/lib/magistrate/supervisor.rb

@@ -9,7 +9,7 @@ require 'net/http'
 require 'uri'
 
 module Magistrate
-  class Supervisor    
+  class Supervisor
     def initialize(config_file, overrides = {})
       @workers = {}
       
@@ -61,10 +61,10 @@ module Magistrate
           puts worker.logs.join("\n")
         end
       end
-      
-      send_status
-      
+
       log "Run Complete at: #{Time.now}" #This is only good in verbose mode, but that's ok
+
+      send_status
     end
     
     # 
@@ -99,6 +99,7 @@ module Magistrate
            :monitor_url => @config[:monitor_url],
            :config_file => @config_file,
            :logs => @logs,
+           :env => `env`,
            :workers => {}
           }
       
@@ -139,6 +140,7 @@ module Magistrate
       response = remote_request Net::HTTP::Get, "api/status/#{self.name}"
       
       if response.code == '200'
+        log "Retrieved remote target states successfully"
         @loaded_from = :server
         @target_states = JSON.parse(response.body)
         save_target_states! # The double serialization here might not be best for performance, but will guarantee that the locally stored file is internally consistent
@@ -198,4 +200,4 @@ module Magistrate
       http.request(request)
     end
   end
-end
+end

data/lib/magistrate/version.rb

@@ -1,3 +1,3 @@
 module Magistrate
-  VERSION = "0.2.1"
-end
+  VERSION = "0.5.0"
+end

data/lib/magistrate/worker.rb

@@ -1,7 +1,9 @@
+require 'yaml'
+
 module Magistrate
 class Worker
 
-  attr_reader :name, :daemonize, :start_cmd, :stop_cmd, :pid_file, :working_dir, :env, :logs, :reset_target_state_to
+  attr_reader :name, :daemonize, :start_cmd, :stop_cmd, :pid_file, :working_dir, :env, :logs, :reset_target_state_to, :bounces
   attr_accessor :target_state, :monitored
 
   def initialize(name, options = {})
@@ -10,40 +12,58 @@ class Worker
     @working_dir  = options[:working_dir]
     @start_cmd    = options[:start_cmd]
     @pid_path     = options[:pid_path]
-    
+
     if @daemonize
-      @pid_file   = File.join(@pid_path, "#{@name}.pid")
+      @pid_file    = File.join(@pid_path, "#{@name}.pid")
+      @status_file = File.join(@pid_path, "#{@name}.status")
       @stop_signal = options[:stop_signal] || 'TERM'
+      @previous_status = load_previous_status
+      @bounces     = @previous_status[:bounces] || 0
     else
       @stop_cmd     = options[:end_cmd]
       @pid_file     = options[:pid_file]
     end
-    
+
     @stop_timeout = 5
     @start_timeout = 5
-    
+
     @env = {}
 
     @target_state = :unknown
     @logs = []
   end
-  
+
   def log(str)
     @logs << str
   end
-  
+
+  # Loads the number of times in a row this worker has been started without successfully staying running
+  # This is stored in the @status_file
+  def load_previous_status
+    File.open(@status_file) { |file| YAML.load(file) } || {}
+  rescue
+    {}
+  end
+
+  def save_status
+    if @status_file
+      File.open(@status_file, "w") { |file| YAML.dump(status, file) } rescue nil
+    end
+  end
+
   def status
     {
       :state => self.state,
       :target_state => self.target_state,
       :pid => self.pid,
+      :bounces => @bounces,
       :logs => @logs
     }
   end
-  
+
   def running?
   end
-  
+
   def state
     if @target_state == :unmonitored || @target_state == :unknown
       :unmonitored
@@ -55,7 +75,7 @@ class Worker
       end
     end
   end
-  
+
   # This is to be called when we first start managing a worker
   # It will check if the pid exists and if so, is the process responding OK?
   # It will take action based on the target state
@@ -68,12 +88,18 @@ class Worker
         log "Restart: Stopping, then Starting, then reporting new target_state of :running"
         stop
         start
-      when :running then start
+      when :running then 
+        start
+        @bounces += 1
       when :stopped then stop
       end
+    else
+      @bounces = 0
     end
+
+    save_status
   end
-  
+
   def start
     if @daemonize
       log "Starting as daemon with double_fork"
@@ -86,11 +112,11 @@ class Worker
     end
     @pid
   end
-  
+
   def stop
     if @daemonize
       signal(@stop_signal, pid)
-        
+
       # Poll to see if it's dead
       @stop_timeout.times do
         begin
@@ -100,10 +126,10 @@ class Worker
           log "Process stopped"
           return
         end
-        
+
         sleep 1
       end
-      
+
       signal('KILL', pid)
       log "Still alive after #{@stop_timeout}s; sent SIGKILL"
     else
@@ -111,20 +137,20 @@ class Worker
       ensure_stop
     end
   end
-  
+
   # single fork self-daemonizing processes
   # we want to wait for them to finish
   def single_fork(command)
     pid = self.spawn(command)
     status = ::Process.waitpid2(pid, 0)
     exit_code = status[1] >> 8
-    
+
     if exit_code != 0
       log "Command exited with non-zero code = #{exit_code}"
     end
     pid
   end
-  
+
   def double_fork(command)
     pid = nil
     # double fork daemonized processes
@@ -137,7 +163,7 @@ class Worker
         pid = self.spawn(command)
         puts pid.to_s # send pid back to forker
       end
-      
+
       ::Process.waitpid(opid, 0)
       w.close
       pid = r.gets.chomp
@@ -146,10 +172,10 @@ class Worker
       r.close rescue nil
       w.close rescue nil
     end
-    
+
     pid
   end
-  
+
   # Fork/exec the given command, returns immediately
   #   +command+ is the String containing the shell command
   #
@@ -266,4 +292,4 @@ class Worker
   end
 
 end
-end
+end

data/spec/magistrate/worker_spec.rb

@@ -1,33 +1,94 @@
 require "spec_helper"
 require "magistrate/worker"
+require 'fakefs'
 
 describe "Magistrate::Worker" do
   describe 'Rake-Like Worker' do
     before(:each) do
-      @process = Magistrate::Worker.new(
-        :name => 'rake_like_worker',
+#      Dir.glob('spec/tmp/pids/*').each do |f|
+#        File.delete(f)
+#      end
+      @worker = Magistrate::Worker.new(
+        'rake_like_worker',
         :daemonize => true,
-        :start_cmd => 'ruby spec/resources/rake_like_worker.rb'
+        :start_cmd => 'ruby spec/resources/rake_like_worker.rb',
+        :pid_path => 'spec/tmp/pids'
       )
       
-      stub(@process).spawn do 
+      stub(@worker).spawn do 
         raise "Unexpected spawn call made...you don't want your specs actually spawning stuff, right?"
       end
     end
   
     describe 'state' do
       it 'should be unmonitored by default' do
-        @process.state.should == :unmonitored
+        @worker.state.should == :unmonitored
       end
       
       it 'should be unmonitored when unmonitored is the target state' do
-        @process.target_state =  :unmonitored
-        @process.state.should == :unmonitored
+        @worker.target_state =  :unmonitored
+        @worker.state.should == :unmonitored
       end
       
       it 'should be stopped when target state other that unmonitored' do
-        @process.target_state = :foo
-        @process.state.should == :stopped
+        @worker.target_state = :foo
+        @worker.state.should == :stopped
+      end
+    end
+
+    describe 'bounces' do
+      it 'should start with 0 bounces' do
+        @worker.bounces.should == 0
+      end
+
+      it 'should show a bounce' do
+        stub(@worker).alive? { false }
+        mock(@worker).start { true }
+        @worker.target_state = :running
+        @worker.supervise!
+        @worker.bounces.should == 1
+      end
+
+      it 'should show no bounce' do
+        stub(@worker).alive? { true }
+        @worker.target_state = :running
+        @worker.supervise!
+        @worker.bounces.should == 0
+      end
+
+      it 'should show a bounce, then reload it' do
+        stub(@worker).alive? { false }
+        mock(@worker).start { true }
+        @worker.target_state = :running
+        @worker.supervise!
+        @worker.bounces.should == 1
+
+        @worker2 = Magistrate::Worker.new(
+          'rake_like_worker',
+          :daemonize => true,
+          :start_cmd => 'ruby spec/resources/rake_like_worker.rb',
+          :pid_path => 'spec/tmp/pids'
+        )
+
+        # The second worker should load the config of the first
+        @worker2.bounces.should == 1
+
+
+        stub(@worker2).alive? { true }
+        @worker2.target_state = :running
+        @worker2.supervise!
+
+        @worker2.bounces.should == 0
+
+        @worker3 = Magistrate::Worker.new(
+          'rake_like_worker',
+          :daemonize => true,
+          :start_cmd => 'ruby spec/resources/rake_like_worker.rb',
+          :pid_path => 'spec/tmp/pids'
+        )
+
+        # Third worker should load the config of the second
+        @worker3.bounces.should == 0
       end
     end
   end
@@ -35,4 +96,4 @@ describe "Magistrate::Worker" do
   describe 'Self-Daemonizing Worker' do
     
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magistrate
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Drew Blas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -05:00
+date: 2011-09-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency