resqued 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5c9debc1401bd8eba5b54ea6d6c2f9ad9787ac
-  data.tar.gz: 2dc545b30cdc8a84c5d1264e4ba68126d087d232
+  metadata.gz: e4fb0bcb7e96b0df5bfa4dfa32340b99a5eea002
+  data.tar.gz: 76710f5182ec2f97a5136619a0ac573c40c6d96a
 SHA512:
-  metadata.gz: 91b94be95c8bc28778f105505e075b56f5f70587a6b51efda99551e8b3503000354d31cc6fa16b10538653c39946a3a51d5c38e336a79dfd87afe9814f18fe31
-  data.tar.gz: 659f8eca03013d49bcaef2641e8dcc7f56d6018b814924f01e5eef362dae9e5d4b05d971adf307739b3b810cf12fb9853e389ee8a08f4775d7dfa2cc4dcbc25f
+  metadata.gz: 9fddc96d14a8c6905d4b8220debe910d88a2a7bc8c6566b9b933117bb7b0f9752a0a339d0c59e6fb06f15894b6779894b776393679ef835f9e2f5afddfdf4649
+  data.tar.gz: dbea0b63b9e6c85593540cb76a2f74e427def5a34e492dcd8a4f9ab7f4d5d32b84078c92ad7c3b85b87e9e451cf5f721b2c6cb39cfe702a7194ccd709329eff2

data/lib/resqued/listener.rb

@@ -19,7 +19,7 @@ module Resqued
     # Runs in the master process.
     def initialize(options)
       @config_paths    = options.fetch(:config_paths)
-      @running_workers = options.fetch(:running_workers) { [] }
+      @old_workers     = options.fetch(:old_workers) { [] }.freeze
       @socket          = options.fetch(:socket)
       @listener_id     = options.fetch(:listener_id) { nil }
     end
@@ -31,7 +31,7 @@ module Resqued
       socket_fd = @socket.to_i
       ENV['RESQUED_SOCKET']      = socket_fd.to_s
       ENV['RESQUED_CONFIG_PATH'] = @config_paths.join(':')
-      ENV['RESQUED_STATE']       = (@running_workers.map { |r| "#{r[:pid]}|#{r[:queue]}" }.join('||'))
+      ENV['RESQUED_STATE']       = (@old_workers.map { |r| "#{r[:pid]}|#{r[:queue]}" }.join('||'))
       ENV['RESQUED_LISTENER_ID'] = @listener_id.to_s
       ENV['RESQUED_MASTER_VERSION'] = Resqued::VERSION
       log "exec: #{Resqued::START_CTX['$0']} listener"
@@ -48,7 +48,7 @@ module Resqued
         options[:config_paths] = path.split(':')
       end
       if state = ENV['RESQUED_STATE']
-        options[:running_workers] = state.split('||').map { |s| Hash[[:pid,:queue].zip(s.split('|'))] }
+        options[:old_workers] = state.split('||').map { |s| Hash[[:pid,:queue].zip(s.split('|'))] }
       end
       if listener_id = ENV['RESQUED_LISTENER_ID']
         options[:listener_id] = listener_id
@@ -127,8 +127,9 @@ module Resqued
 
     # Private: send a signal to all the workers.
     def kill_all(signal)
-      log "kill -#{signal} #{running_workers.map { |r| r.pid }.inspect}"
-      running_workers.each { |worker| worker.kill(signal) }
+      idle, running = partition_workers
+      log "kill -#{signal} #{running.map { |r| r.pid }.inspect}"
+      running.each { |worker| worker.kill(signal) }
     end
 
     # Private: all available workers
@@ -136,7 +137,12 @@ module Resqued
 
     # Private: just the running workers.
     def running_workers
-      workers.select { |worker| ! worker.idle? }
+      partition_workers.last
+    end
+
+    # Private: Split the workers into [not-running, running]
+    def partition_workers
+      workers.partition { |worker| worker.idle? }
     end
 
     # Private.
@@ -204,7 +210,7 @@ module Resqued
     # Private.
     def init_workers(config)
       @workers = config.build_workers
-      @running_workers.each do |running_worker|
+      @old_workers.each do |running_worker|
         if blocked_worker = @workers.detect { |worker| worker.idle? && worker.queue_key == running_worker[:queue] }
           blocked_worker.wait_for(running_worker[:pid].to_i)
         end

data/lib/resqued/master.rb

@@ -111,7 +111,7 @@ module Resqued
 
     def start_listener
       return if @current_listener || @listener_backoff.wait?
-      @current_listener = ListenerProxy.new(:config_paths => @config_paths, :running_workers => all_listeners.map { |l| l.running_workers }.flatten, :listener_id => next_listener_id)
+      @current_listener = ListenerProxy.new(:config_paths => @config_paths, :old_workers => all_listeners.map { |l| l.running_workers }.flatten, :listener_id => next_listener_id)
       @current_listener.run
       listener_status @current_listener, 'start'
       @listener_backoff.started

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.4'
+  VERSION = '0.7.6'
 end

data/lib/resqued/worker.rb

@@ -13,6 +13,7 @@ module Resqued
       @config = options.fetch(:config)
       @interval = options[:interval]
       @backoff = Backoff.new
+      @pids = []
     end
 
     # Public: The pid of the worker process.
@@ -35,11 +36,13 @@ module Resqued
     def wait_for(pid)
       raise "Already running #{@pid} (can't wait for #{pid})" if @pid
       @self_started = false
+      @pids << pid
       @pid = pid
     end
 
     # Public: The old worker process finished!
     def finished!(process_status)
+      log :debug, "I (#{@pid}/#{@pids.inspect}/self_started=#{@self_started}/killed=#{@killed}) died like this: #{process_status}"
       @pid = nil
       @backoff.died unless @killed
     end
@@ -56,6 +59,7 @@ module Resqued
       @self_started = true
       @killed = false
       if @pid = fork
+        @pids << @pid
         # still in the listener
         log "Forked worker #{@pid}"
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio