perfectqueue 0.8.14 → 0.8.15

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-30 version 0.8.15
+
+* Improved detach process routines
+
+
 == 2012-08-16 version 0.8.14
 
 * Improved detach process routines

data/lib/perfectqueue/command/perfectqueue.rb

@@ -12,6 +12,7 @@ commands:
     force_finish <key>               Force finish a task
     run <class>                      Run a worker process
     init                             Initialize a backend database
+    debug <address>                  Connect to debug interface of a worker
 
 ]
 op.version = PerfectQueue::VERSION
@@ -20,6 +21,7 @@ env = ENV['RAILS_ENV'] || 'development'
 config_path = 'config/perfectqueue.yml'
 include_dirs = []
 require_files = []
+debug_listen = nil
 
 task_options = {
 }
@@ -100,6 +102,11 @@ begin
     cmd = :init
     usage nil unless ARGV.length == 0
 
+  when 'debug'
+    cmd = :debug
+    usage nil unless ARGV.length == 1
+    debug_address = ARGV[0]
+
   else
     raise "unknown command: '#{cmd}'"
   end
@@ -163,5 +170,28 @@ when :init
   PerfectQueue.open(config_load_proc.call) {|queue|
     queue.client.init_database
   }
+
+when :debug
+  require 'irb'
+  require 'drb'
+  if debug_address.include?('/')
+    # unix
+    require 'drb/unix'
+    uri = "drbunix:#{debug_address}"
+  else
+    # tcp
+    uri = "druby://#{debug_address}"
+  end
+
+  puts "Connecting to #{uri}"
+
+  remote_supervisor = DRb::DRbObject.new_with_uri(uri)
+  Supervisor = remote_supervisor
+  Engine = remote_supervisor.engine
+
+  puts "Engine is initialized as a remote engine instance."
+
+  ARGV.clear
+  IRB.start
 end
 

data/lib/perfectqueue/engine.rb

@@ -38,6 +38,8 @@ module PerfectQueue
       restart(false, config)
     end
 
+    attr_reader :processors
+
     def restart(immediate, config)
       return nil if @finish_flag.set?
 

data/lib/perfectqueue/supervisor.rb

@@ -33,11 +33,15 @@ module PerfectQueue
       @config_load_proc = block
     end
 
+    attr_reader :engine
+
     def run
       @log.info "PerfectQueue #{VERSION}"
 
       install_signal_handlers do
-        @engine = Engine.new(@runner, load_config)
+        config = load_config
+        @engine = Engine.new(@runner, config)
+        listen_debug_server(config)
         begin
           @engine.run
         ensure
@@ -111,6 +115,31 @@ module PerfectQueue
       return config
     end
 
+    def listen_debug_server(config)
+      address = config[:debug].to_s
+      return if address.empty?
+
+      require 'drb'
+      if address.include?('/')
+        # unix
+        require 'drb/unix'
+        uri = "drbunix:#{address}"
+        if File.exist?(address)
+          File.unlink(address) rescue nil
+        end
+      else
+        # tcp
+        a, b = address.split(':',2)
+        if b
+          uri = "druby://#{a}:#{b}"
+        else
+          uri = "druby://0.0.0.0:#{a}"
+        end
+      end
+
+      @debug_server = DRb::DRbServer.new(uri, self)
+    end
+
     def install_signal_handlers(&block)
       sig = SignalQueue.start do |sig|
         sig.trap :TERM do

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.14"
+  VERSION = "0.8.15"
 end

data/lib/perfectqueue/worker.rb

@@ -60,7 +60,7 @@ module PerfectQueue
           wait_time = Time.now + @detach_wait
           while (w = wait_time - Time.now) > 0
             sleep [1, w].max
-            pid, status = Process.waitpid2(@pid)
+            pid, status = Process.waitpid2(@pid, Process::WNOHANG)
             break if pid
           end
 
@@ -73,7 +73,7 @@ module PerfectQueue
     end
 
     def stop(immediate)
-      send_signal(immediate ? :TERM : :QUIT)
+      send_signal(immediate ? :QUIT : :TERM)
     end
 
     def restart(immediate)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel