workforce 0.2.4 → 0.3.0

data/TODO.md

@@ -0,0 +1,4 @@
+= TODO
+
+* Define specialized type of workers such as Queue-based and Timed-based.
+* Implement proper restarting/reloading for smoother deploys.

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/bin/workforce

@@ -6,7 +6,7 @@ require "workforce"
 config = Workforce::Config.instance
 
 optparser = OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options] #{Workforce::Controller::ACTIONS.join("|")} [WORKER]"
+  opts.banner = "Usage: #{$0} [options] #{Workforce::Controller::ACTIONS.join("|")} [WORKER]*"
 
   opts.separator ""
   opts.separator "Options:"
@@ -27,6 +27,10 @@ optparser = OptionParser.new do |opts|
     config.log_dir = log_dir
   end
   
+  opts.on("-s", "--schedule WORKER:NUM", "Automatically schedule NUM instance of WORKER on start") do |arg|
+    config.schedule(*arg.split(/:/))
+  end
+  
   opts.on("-h", "--help", "Show this screen") do
     puts optparser
     exit

data/lib/workforce/configuration.rb

@@ -24,6 +24,7 @@ module Workforce
       yield self if block_given?
       @before_callbacks = Hash.new { |h,k| h[k] = [] }
       @after_callbacks  = Hash.new { |h,k| h[k] = [] }
+      @num_instances    = Hash.new { |h,k| h[k] = 0 }
     end
     
     def load_file(file_path)
@@ -32,17 +33,25 @@ module Workforce
 
     def before(event, &block)
       if block_given?
-        @before_callbacks[event] << block
+        @before_callbacks[event.to_sym] << block
       else
-        @before_callbacks[event]
+        @before_callbacks[event.to_sym]
       end
     end
     
     def after(event, &block)
       if block_given?
-        @after_callbacks[event] << block
+        @after_callbacks[event.to_sym] << block
       else
-        @after_callbacks[event]
+        @after_callbacks[event.to_sym]
+      end
+    end
+    
+    def schedule(worker, number = nil)
+      if number
+        @num_instances[worker.to_sym] = Integer(number)
+      else
+        @num_instances[worker.to_sym]
       end
     end
 

data/lib/workforce/controller.rb

@@ -16,78 +16,90 @@ module Workforce
     
     def list
       puts "Available workers:"
-      Dir["#{Config.get(:workers_dir)}/*"].each do |file|
-        worker_name = Inflector.camelcase(File.basename(file, ".rb"))
-        puts "  * #{worker_name}"
-      end
-    end
-    
-    def run(worker_klass)
-      if running?(worker_klass)
-        puts "#{worker_klass}'s manager already running"
-        exit(1)
-      end
       
-      run_callbacks(:start) do
-        manager = Workforce::Manager.new(get_klass(worker_klass))
-        store_pid(worker_klass, Process.pid)
-        manager.run
-        remove_pid_file(worker_klass)
+      available_workers.each do |worker|
+        puts "  * #{worker}"
       end
     end
     
-    def status(worker_klass)
-      if running?(worker_klass)
-        puts "Running (#{running_pid(worker_klass)})"
-      else
-        puts "Not running"
+    def run(*workers)
+      perform_action(:start, workers) do |worker_klass|
+        if running?(worker_klass)
+          puts "#{worker_klass}'s manager already running"
+        else
+          manager = Workforce::Manager.new(worker_klass)
+          store_pid(worker_klass, Process.pid)
+          manager.run
+          remove_pid_file(worker_klass)
+        end
       end
     end
-    
-    def start(worker_klass)
-      if running?(worker_klass)
-        puts "#{worker_klass}'s manager already running"
-        exit(1)
-      end
-      
-      run_callbacks(:start) do
-        manager = Workforce::Manager.new(get_klass(worker_klass))
-        store_pid(worker_klass, manager.launch)
+        
+    def start(*workers)
+      perform_action(:start, workers) do |worker_klass|
+        if running?(worker_klass)
+          puts "#{worker_klass}'s manager already running"
+        else
+          puts "Starting #{worker_klass}"
+          manager = Workforce::Manager.new(worker_klass)
+          store_pid(worker_klass, manager.launch)
+          num = Config.instance.schedule(worker_klass.name)
+          puts "Scheduling #{num} instances"
+          num.times { sleep 0.005; schedule(worker_klass) }
+        end
       end
     end
       
-    def stop(worker_klass)
-      run_callbacks(:stop) do      
-        Process.kill(:QUIT, running_pid(worker_klass))
-        remove_pid_file(worker_klass)
+    def stop(*workers)
+      perform_action(:stop, workers) do |worker_klass|
+        if running?(worker_klass)
+          puts "Stopping #{worker_klass}"
+          begin
+            Process.kill(:QUIT, running_pid(worker_klass))
+          rescue Errno::ESRCH
+          end
+          remove_pid_file(worker_klass)
+        else
+          puts "#{worker_klass} is not running"
+        end        
       end
     end
     
-    def restart(worker_klass)
-      run_callbacks(:restart) do
+    def restart(*workers)
+      perform_action(:restart, workers) do |worker_klass|
         stop(worker_klass) if running?(worker_klass)
         start(worker_klass)
       end
     end
     
-    def schedule(worker_klass)
-      unless running?(worker_klass)
-        puts "#{worker_klass}'s manager not running yet"
-        exit(1)
-      end
-      
-      run_callbacks(:schedule) do
-        Process.kill(:USR1, running_pid(worker_klass))
+    def status(*workers)
+      perform_action(:status, workers) do |worker_klass|
+        if running?(worker_klass)
+          puts "#{worker_klass}: Running (#{running_pid(worker_klass)})"
+        else
+          puts "#{worker_klass}: Not running"
+        end
       end
     end
     
-    def dispose(worker_klass)
-      unless running?(worker_klass)
-        puts "#{worker_klass}'s manager not running yet"
-        exit(1)
+    def schedule(*workers)
+      perform_action(:schedule, workers) do |worker_klass|
+        unless running?(worker_klass)
+          puts "#{worker_klass}'s manager not running yet"
+        else
+          puts "Scheduling new instance of #{worker_klass}"
+          Process.kill(:USR1, running_pid(worker_klass))
+        end
       end
+    end
+    
+    def dispose(*workers)
+      perform_action(:dispose, workers) do |worker_klass|
+        unless running?(worker_klass)
+          puts "#{worker_klass}'s manager not running yet"
+          exit(1)
+        end
       
-      run_callbacks(:dispose) do
         Process.kill(:USR2, running_pid(worker_klass))
       end
     end
@@ -107,8 +119,26 @@ module Workforce
       Config.instance.after(event).each { |callback| callback.call }
     end
     
+    def available_workers
+      Dir["#{Config.get(:workers_dir)}/*"].map do |file|
+        worker_name = Inflector.camelcase(File.basename(file, ".rb"))
+        get_klass(worker_name)
+      end
+    end
+    
+    def perform_action(action, workers, &block)
+      run_callbacks(action) do
+        if workers.empty?
+          workers = available_workers
+        else
+          workers = workers.map { |worker_name| get_klass(worker_name) }
+        end
+        workers.each(&block)
+      end
+    end
+    
     def pid_file(worker_klass)
-      "#{Workforce::Config.get(:pid_dir)}/#{Workforce::Inflector.underscore(worker_klass)}.pid"
+      "#{Workforce::Config.get(:pid_dir)}/#{Workforce::Inflector.underscore(worker_klass.to_s)}.pid"
     end
   
     def running?(worker_klass)

data/lib/workforce/manager.rb

@@ -46,7 +46,6 @@ module Workforce
       log_errors do
         logger.info "Starting manager for #{@worker}"
 
-        @running = true
         $0 = "Workforce: #{@worker.name} master"
 
         trap_signal(:INT, :shutdown)
@@ -59,6 +58,8 @@ module Workforce
           logger.info "Removing process (#{pid}) from worker pool"
           @pids.delete(pid)
         end
+        
+        @running = true
 
         # Block process until something is written to @pipe_out
         IO.select([@pipe_in], nil, nil, nil)

data/sample/config_sample.rb

@@ -3,3 +3,5 @@ base_path = File.dirname(__FILE__)
 workers_dir "#{base_path}/workers"
 pid_dir "#{base_path}/pid"
 log_dir "#{base_path}/log"
+
+schedule :SleepDaemon, 5

data/sample/workers/sleep_daemon2.rb

@@ -0,0 +1,5 @@
+class SleepDaemon2
+  def run
+    loop { sleep 1 }
+  end
+end

data/workforce.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{workforce}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Kochenburger"]
-  s.date = %q{2010-05-31}
+  s.date = %q{2010-07-05}
   s.default_executable = %q{workforce}
   s.description = %q{Workforce is an attempt to create a framework to develop background processes and controlling the execution of these processes in a distributed environment}
   s.email = %q{divoxx@gmail.com}
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.md",
      "Rakefile",
+     "TODO.md",
      "VERSION",
      "bin/workforce",
      "lib/workforce.rb",
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/workforce/manager.rb",
      "sample/config_sample.rb",
      "sample/workers/sleep_daemon.rb",
+     "sample/workers/sleep_daemon2.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "workforce.gemspec"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rodrigo Kochenburger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -03:00
+date: 2010-07-05 00:00:00 -03:00
 default_executable: workforce
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - VERSION
 - bin/workforce
 - lib/workforce.rb
@@ -69,6 +70,7 @@ files:
 - lib/workforce/manager.rb
 - sample/config_sample.rb
 - sample/workers/sleep_daemon.rb
+- sample/workers/sleep_daemon2.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - workforce.gemspec