resqued 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66bf0dfa9299a44f871ae9835183600f6cc4e79
-  data.tar.gz: 318a6d0ec20aebbaf97260c3f2253394187ae2e1
+  metadata.gz: dab65ebe5befd4cb605dc27208740e8c11079ca6
+  data.tar.gz: 73d6a230a3273aaf351e55008a01fe4a0a479944
 SHA512:
-  metadata.gz: cd97e21578a9cddaf82210459dc148790ed65ba92cd92c0d013764b03826df4683414ec1bfe56eeb73ebfe1bfe0854ba49826885a94c0c1ea38461e82a4affce
-  data.tar.gz: d8b4de064f53197605f7fc64bec9954a0bc8f4003bcd0c7334581043941e6e4762d42db0ee823a6c7ac085eaf6eb990be6d660b4dfd733bf877be09aa698ef5d
+  metadata.gz: f8215347e188cbd78fef8561cfaed3ae9e00156de9bb255dd3a2fc90d3b2dbe3dc30870ad44e22a95e73b57f798be7cd169133b07779c93c5a180394b0be242e
+  data.tar.gz: 249de2ac4fb9a5d40c97322b9d8176907bee59748051f22679cd1bba8eff6154256cd4b3b6d330097e3aaf790798185eae503240dc0589a5f5288f20007a95f2

data/exe/resqued

@@ -46,6 +46,7 @@ end
 
 opts.parse!
 options[:config_paths] = ARGV
+options[:status_pipe] = STDOUT
 
 if options[:config_paths].size == 0
   puts opts

data/lib/resqued/listener_proxy.rb

@@ -73,6 +73,7 @@ module Resqued
         case line = @master_socket.readline
         when /^\+(\d+),(.*)$/
           worker_pids[$1] = $2
+          on_activity.worker_started($1) if on_activity
         when /^-(\d+)$/
           worker_pids.delete($1)
           on_activity.worker_finished($1) if on_activity

data/lib/resqued/master.rb

@@ -19,6 +19,7 @@ module Resqued
     def initialize(options)
       @config_paths = options.fetch(:config_paths)
       @pidfile      = options.fetch(:master_pidfile) { nil }
+      @status_pipe  = options.fetch(:status_pipe) { nil }
       @listener_backoff = Backoff.new
       @listeners_created = 0
     end
@@ -112,6 +113,7 @@ module Resqued
       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.run
+      listener_status @current_listener, 'start'
       @listener_backoff.started
       listener_pids[@current_listener.pid] = @current_listener
       write_procline
@@ -127,10 +129,16 @@ module Resqued
       end
     end
 
+    # Listener message: A worker just started working.
+    def worker_started(pid)
+      worker_status(pid, 'start')
+    end
+
     # Listener message: A worker just stopped working.
     #
     # Forwards the message to the other listeners.
     def worker_finished(pid)
+      worker_status(pid, 'stop')
       all_listeners.each do |other|
         other.worker_finished(pid)
       end
@@ -140,6 +148,7 @@ module Resqued
     #
     # Promotes a booting listener to be the current listener.
     def listener_running(listener)
+      listener_status(listener, 'ready')
       if listener == @current_listener
         kill_listener(:QUIT, @last_good_listener)
         @last_good_listener = nil
@@ -189,7 +198,9 @@ module Resqued
             @listener_backoff.died
             @current_listener = nil
           end
-          listener_pids.delete(lpid).dispose # This may leak workers.
+          dead_listener = listener_pids.delete(lpid)
+          listener_status dead_listener, 'stop'
+          dead_listener.dispose
           write_procline
         else
           return
@@ -234,5 +245,21 @@ module Resqued
     def write_procline
       $0 = "#{procline_version} master [gen #{@listeners_created}] [#{listener_pids.size} running] #{ARGV.join(' ')}"
     end
+
+    def listener_status(listener, status)
+      if listener && listener.pid
+        status_message('listener', listener.pid, status)
+      end
+    end
+
+    def worker_status(pid, status)
+      status_message('worker', pid, status)
+    end
+
+    def status_message(type, pid, status)
+      if @status_pipe
+        @status_pipe.write("#{type},#{pid},#{status}\n")
+      end
+    end
   end
 end

data/lib/resqued/test_case.rb

@@ -0,0 +1,84 @@
+# This file includes example assertions for your resqued configuration.
+#
+#     assert_resqued 'config/resqued/environment.rb', 'config/resqued/pool-a.rb'
+module Resqued
+  module TestCase
+    module ForkToStart
+      # Public: Fork a process that spins up a Resqued::Master process directly.
+      def assert_resqued(*configs)
+        options = configs.last.is_a?(Hash) ? configs.pop : {}
+        check_workers  = options.fetch(:expect_workers, false)
+        worker_timeout = options.fetch(:worker_timeout, 5)
+        resqued_bin    = options.fetch(:resqued_bin) { `which resqued || bundle exec which resqued`.chomp }
+        status = IO.pipe
+        if pid = fork
+          message = read_status_from_resqued(:pipe => status[0], :pid => pid)
+          if message !~ /^listener,\d+,start$/
+            fail "Expected listener to start, but received #{message.inspect}"
+          end
+          message = read_status_from_resqued(:pipe => status[0], :pid => pid)
+          if message !~ /^listener,\d+,ready$/
+            fail "Expected listener to be ready, but received #{message.inspect}"
+          end
+          if check_workers
+            start = Time.now
+            workers_started = 0
+            loop do
+              elapsed = Time.now - start
+              time_remaining = worker_timeout - elapsed
+              break unless time_remaining > 0
+              if message = read_status_from_resqued(:pipe => status[0], :pid => pid, :timeout => time_remaining)
+                if message =~ /worker,\d+,start/
+                  workers_started = workers_started + 1
+                else
+                  fail "Expected to see workers starting, instead saw #{message.inspect}"
+                end
+              end
+            end
+            if workers_started == 0
+              fail "Expected at least one worker to start, but none did"
+            end
+          end
+        else
+          $0 = "resqued master for #{$0}"
+          unless ENV['NOISY_RESQUED_TESTS']
+            devnull = File.open('/dev/null', 'w')
+            $stdout.reopen(devnull)
+            $stderr.reopen(devnull)
+          end
+          begin
+            # This should match how `exe/resqued` starts the master process.
+            require 'resqued'
+            Resqued::START_CTX['$0'] = resqued_bin
+            Resqued::Master.new(:config_paths => configs, :status_pipe => status[1]).run
+          rescue Object => e
+            # oops
+          end
+          exit! # Do not make this look like a failing test.
+        end
+      ensure
+        begin
+          Process.kill :QUIT, pid
+          Process.waitpid2(pid) if pid
+        rescue Errno::ESRCH, Errno::ECHILD
+          # already dead.
+        end
+      end
+
+      def read_status_from_resqued(options)
+        status  = options.fetch(:pipe)
+        pid     = options.fetch(:pid)
+        timeout = options[:timeout]
+        loop do
+          if IO.select([status], nil, nil, timeout || 2)
+            return status.readline.chomp
+          elsif dead = Process.waitpid2(pid, Process::WNOHANG)
+            fail "Resqued stopped too soon."
+          elsif timeout
+            return nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -145,6 +145,7 @@ files:
 - lib/resqued/pidfile.rb
 - lib/resqued/procline_version.rb
 - lib/resqued/sleepy.rb
+- lib/resqued/test_case.rb
 - lib/resqued/version.rb
 - lib/resqued/worker.rb
 - lib/resqued.rb