magistrate 0.2.0 → 0.2.1

data/lib/magistrate/supervisor.rb

@@ -23,9 +23,9 @@ module Magistrate
       
       FileUtils.mkdir_p(@pid_path) unless File.directory? @pid_path
 
-      @config[:workers].each do |k,v|
-        v[:pid_path] ||= @pid_path
-        @workers[k] = Process.new(k,v)
+      @config[:workers].each do |name,params|
+        params[:pid_path] ||= @pid_path
+        @workers[name] = Worker.new(name, params)
       end
       
       @loaded_from = nil
@@ -46,9 +46,19 @@ module Magistrate
       # Pull in all already-running workers and set their target states
       @workers.each do |k, worker|
         worker.supervise!
+        
+        if worker.reset_target_state_to
+          begin
+            remote_request Net::HTTP::Post, "supervisors/#{self.name}/workers/#{worker.name}/set_target_state/#{worker.reset_target_state_to}"
+          rescue StandardError => e
+            log "Error resetting target_state for #{worker.name} to #{worker.reset_target_state_to}"
+            log "Error: #{e}"
+          end
+        end
+        
         if @verbose
           puts "==== Worker: #{k}"
-          worker.logs.join("\n")
+          puts worker.logs.join("\n")
         end
       end
       
@@ -92,8 +102,8 @@ module Magistrate
            :workers => {}
           }
       
-      @workers.each do |k,process|
-        s[:workers][k] = process.status
+      @workers.each do |k,worker|
+        s[:workers][k] = worker.status
       end
       
       s
@@ -126,7 +136,7 @@ module Magistrate
     # Gets and sets @target_states from the server
     # Automatically falls back to the local cache
     def load_remote_target_states!
-      response = remote_request(Net::HTTP::Get)
+      response = remote_request Net::HTTP::Get, "api/status/#{self.name}"
       
       if response.code == '200'
         @loaded_from = :server
@@ -162,7 +172,7 @@ module Magistrate
     # Currently only sends basic worker info, but could start sending lots more:
     # 
     def send_status
-      remote_request Net::HTTP::Post, { :status => JSON.generate(status) }
+      remote_request Net::HTTP::Post, "api/status/#{self.name}", { :status => JSON.generate(status) }
     rescue StandardError => e
       log "Sending status to #{@config[:monitor_url]} failed"
       log "Error: #{e}"
@@ -174,11 +184,12 @@ module Magistrate
     end
     
     # Wrapper method for easy remote requests
-    def remote_request(klass, form_data = nil)
+    def remote_request(klass, path, form_data = {})
+      log "#{klass} request to #{path}"
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.read_timeout = 30
-      request = klass.new(@uri.request_uri + "api/status/#{self.name}")
-      request.set_form_data(form_data) if form_data
+      request = klass.new(@uri.request_uri + path)
+      request.set_form_data(form_data) if klass == Net::HTTP::Post
       
       if @config[:http_username] && @config[:http_password]
         request.basic_auth @config[:http_username], @config[:http_password]

data/lib/magistrate/version.rb

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

data/lib/magistrate/{process.rb → worker.rb}

@@ -1,7 +1,7 @@
 module Magistrate
-class Process
+class Worker
 
-  attr_reader :name, :daemonize, :start_cmd, :stop_cmd, :pid_file, :working_dir, :env, :logs
+  attr_reader :name, :daemonize, :start_cmd, :stop_cmd, :pid_file, :working_dir, :env, :logs, :reset_target_state_to
   attr_accessor :target_state, :monitored
 
   def initialize(name, options = {})
@@ -62,21 +62,26 @@ class Process
   def supervise!
     log "Supervising.  Is: #{state}.  Target: #{@target_state}"
     if state != @target_state
-      if @target_state == :running
-        start
-      elsif @target_state == :stopped
+      case @target_state
+      when :forced_restart then
+        @reset_target_state_to = :running
+        log "Restart: Stopping, then Starting, then reporting new target_state of :running"
         stop
+        start
+      when :running then start
+      when :stopped then stop
       end
     end
   end
   
   def start
-    log "#{@name} starting"
     if @daemonize
+      log "Starting as daemon with double_fork"
       @pid = double_fork(@start_cmd)
       # TODO: Should check if the pid really exists as we expect
       write_pid
     else
+      log "Starting as self-daemonizing with single_fork"
       @pid = single_fork(@start_cmd)
     end
     @pid

data/lib/magistrate.rb

@@ -2,8 +2,8 @@ $:.unshift File.dirname(__FILE__)
 
 require 'magistrate/core_ext'
 require 'magistrate/version'
+require 'magistrate/worker'
 require 'magistrate/supervisor'
-require 'magistrate/process'
 
 module Magistrate
   

data/spec/magistrate/{process_spec.rb → worker_spec.rb}

@@ -1,10 +1,10 @@
 require "spec_helper"
-require "magistrate/process"
+require "magistrate/worker"
 
-describe "Magistrate::Process" do
+describe "Magistrate::Worker" do
   describe 'Rake-Like Worker' do
     before(:each) do
-      @process = Magistrate::Process.new(
+      @process = Magistrate::Worker.new(
         :name => 'rake_like_worker',
         :daemonize => true,
         :start_cmd => 'ruby spec/resources/rake_like_worker.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magistrate
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Drew Blas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -05:00
+date: 2011-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,13 +151,13 @@ extra_rdoc_files: []
 files: 
 - bin/magistrate
 - lib/magistrate/core_ext.rb
-- lib/magistrate/process.rb
 - lib/magistrate/supervisor.rb
 - lib/magistrate/version.rb
+- lib/magistrate/worker.rb
 - lib/magistrate.rb
 - README.md
-- spec/magistrate/process_spec.rb
 - spec/magistrate/supervisor_spec.rb
+- spec/magistrate/worker_spec.rb
 - spec/magistrate_spec.rb
 - spec/resources/example.yml
 - spec/resources/rake_like_worker.rb