queue_map 0.1 → 0.2

data/bin/queue_map_consumer

@@ -1,39 +1,79 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-options = {}
+@options = {}
 opt_p = OptionParser.new do |opts|
-  opts.banner = "Usage: script/export_sales.rb [options] path/to/consumer.rb"
+  opts.banner = "Usage: queue_map_consumer [options] [ start | stop | restart ] path/to/consumer.rb"
   opts.separator "Options:"
   opts.on('-f', '--foreground', "Run appraiser in the foreground") do
-    options[:foreground] = true
+    @options[:foreground] = true
   end
   opts.on_tail("-h", "--help", "Show this message")
 end
 opt_p.parse!
-consumer_path = ARGV[0]
+action, consumer_path = ARGV
 if consumer_path.nil?
   puts opt_p
   exit 1
 end
 
 require "rubygems"
+require "background_process"
 require File.dirname(__FILE__) + "/../lib/queue_map"
 require File.dirname(__FILE__) + "/../lib/queue_map/consumer"
 
-consumer = QueueMap::Consumer.from_file(consumer_path, :strategy => :fork)
-
-unless options[:foreground]
-  # daemonize
-  puts "Daemonizing"
-  pid = Kernel.fork
-  if pid
-    Process.detach(pid)
-    puts "Daemonized as #{pid}"
-    exit 0
-  else
-    Signal.trap('HUP', 'IGNORE') # Don't die upon logout
+@consumer = QueueMap::Consumer.from_file(consumer_path, :strategy => :fork)
+@pid_file = @consumer.pid_file
+
+def pid
+  return nil unless File.exist?(@pid_file)
+  pid = File.read(@pid_file).to_i
+  begin
+    Process.getpgid(pid)
+    pid
+  rescue Errno::ESRCH
+    nil
+  end
+end
+
+def stop
+  (puts "Not running"; exit 1) unless pid
+  Process.kill("INT", pid)
+  puts "Sending INT to #{pid}"
+end
+
+def start
+  (puts "Already running as #{pid}"; exit 1) if pid
+  puts "Starting consumers..."
+  unless @options[:foreground]
+    # daemonize
+    puts "Daemonizing"
+    pid = Kernel.fork
+    if pid
+      Process.detach(pid)
+      puts "Daemonized as #{pid}"
+      File.open(@consumer.pid_file, "w") { |f| f << pid.to_s }
+      exit 0
+    else
+      Signal.trap('HUP', 'IGNORE') # Don't die upon logout
+    end
   end
+  @consumer.start
+end
+
+def restart
+  old_pid = pid
+  @consumer.before_fork_procs << (lambda do
+    Process.kill("INT", old_pid) rescue Errno::ESRCH
+  end)
+  FileUtils.rm_f(@pid_file)
+  start
+end
+
+case action
+when "start" then start
+when "stop" then stop
+when "restart" then restart
+else
+  puts "Unknown action: #{action}"
 end
-puts "Starting consumers..."
-consumer.start

data/lib/queue_map/consumer.rb

@@ -1,6 +1,7 @@
 class QueueMap::Consumer
   attr_accessor :count_workers, :worker_proc, :on_exception_proc
-  attr_reader :name
+  attr_reader :name, :master_pid
+  attr_writer :pid_file
   class Configurator
     def initialize(base)
       @base = base
@@ -12,6 +13,7 @@ class QueueMap::Consumer
     def worker(&block);             @base.worker_proc             =  block; end
     def on_exception(&block);       @base.on_exception_proc       =  block; end
     def count_workers(value);       @base.count_workers           =  value; end
+    def pid_file(value);            @base.pid_file                =  value; end
   end
 
 
@@ -53,6 +55,10 @@ class QueueMap::Consumer
   def between_responses_procs
     @between_responses_procs ||= []
   end
+  
+  def pid_file
+    "#{name}_consumer.pid"
+  end
 
   def start
     raise RuntimeError, "Called start on Consumer without strategy"
@@ -134,6 +140,7 @@ class QueueMap::Consumer
     end
 
     def stop(graceful = true)
+      $0 = $0 + " [shutting down]"
       @child_pids.each do |pid|
         begin
           Process.kill(graceful ? "INT" : "TERM", pid)

data/lib/queue_map/version.rb

@@ -1,3 +1,3 @@
 module QueueMap
-  VERSION=0.1
+  VERSION="0.2"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: queue_map
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Tim Harper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -06:00
+date: 2010-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency