resqued 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e5a83c5ce92209fd4dc917cb9b85a145206047a
-  data.tar.gz: de4d9dabfe0a6f37e8b973faa0d436cde0618c90
+  metadata.gz: c29c9729084c7b55ed2bed11f71f1083c88b0ba8
+  data.tar.gz: cbbbdd94116fffad8ec09bba65319b3499017446
 SHA512:
-  metadata.gz: a2bdc8dd96addce81a01ea4248c1471d75ed803142edfd32f166cb2e2d4a7683b08b848ea4bd513e3520a981d8dee6cd44f73a0cdacf3310336919b02e6ae07f
-  data.tar.gz: 4945877eb7e3c0312996d43cd447f271966d0cc97fefca9ef5ed8019d3cc587fb3ab1f8090326655be30550ff76745aca46ca682ddc65b91963ff5fd3f6d5d01
+  metadata.gz: 0984ea77d172f109264c8b8a34fe0997f7ab4ec19293cec77588c5ccf918752524cbec37c6bd9dac93462d84c75b3a86873cce7b9dd4cd1e3790ee4e88867356
+  data.tar.gz: 88484776caa1bf5faf77281f9f9c55d111e96eb955f1293b94c2f801b19203fe509be1b5d86a57948ded1e7282660df94f1169c7a908001a31f1da661ab0e03b

data/exe/resqued

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
 
+if ARGV == ['listener']
+  require 'resqued/listener'
+  Resqued::Listener.exec!
+  exit 0
+end
+
 require 'optparse'
 
 options = {}
@@ -54,7 +60,8 @@ if test
     puts "#{index + 1}: #{worker.queues.join(',')}"
   end
 else
-  require 'resqued/master'
+  require 'resqued'
+  Resqued::START_CTX['$0'] = $0.dup
   resqued = Resqued::Master.new(options)
   if daemonize
     require 'resqued/daemon'

data/exe/resqued-listener

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+puts "resqued-listener is deprecated and will be removed."
+puts "Stop and start the master process to remove your dependence on resqued-listener."
 require 'resqued/listener'
 Resqued::Listener.exec!

data/lib/resqued.rb

@@ -1,2 +1,6 @@
 require 'resqued/master'
 require 'resqued/version'
+
+module Resqued
+  START_CTX = {}
+end

data/lib/resqued/listener.rb

@@ -30,8 +30,8 @@ module Resqued
       ENV['RESQUED_CONFIG_PATH'] = @config_paths.join(':')
       ENV['RESQUED_STATE']       = (@running_workers.map { |r| "#{r[:pid]}|#{r[:queue]}" }.join('||'))
       ENV['RESQUED_LISTENER_ID'] = @listener_id.to_s
-      # This may not work in rubies earlier than 1.9.
-      Kernel.exec('resqued-listener', socket_fd => socket_fd)
+      log "exec: #{Resqued::START_CTX['$0']} listener"
+      Kernel.exec(Resqued::START_CTX['$0'], 'listener', socket_fd => socket_fd) # The hash at the end only works in new-ish (1.9+ or so) rubies. It's required for ruby 2.0.
     end
 
     # Public: Given args from #exec, start this listener.
@@ -52,7 +52,7 @@ module Resqued
       new(options).run
     end
 
-    SIGNALS = [ :QUIT, :INT, :TERM ]
+    SIGNALS = [ :CONT, :QUIT, :INT, :TERM ]
 
     SIGNAL_QUEUE = []
 
@@ -83,6 +83,8 @@ module Resqued
         case signal = SIGNAL_QUEUE.shift
         when nil
           yawn
+        when :CONT
+          kill_all(signal)
         when :QUIT, :INT, :TERM
           return signal
         end

data/lib/resqued/master.rb

@@ -41,7 +41,7 @@ module Resqued
       loop do
         read_listeners
         reap_all_listeners(Process::WNOHANG)
-        start_listener
+        start_listener unless @paused
         case signal = SIGNAL_QUEUE.shift
         when nil
           yawn(@listener_backoff.how_long? || 30.0)
@@ -51,6 +51,14 @@ module Resqued
           reopen_logs
           log "Restarting listener with new configuration and application."
           kill_listener(:QUIT)
+        when :USR2
+          log "Pause job processing"
+          @paused = true
+          kill_listener(:QUIT)
+        when :CONT
+          log "Resume job processing"
+          @paused = false
+          kill_all_listeners(:CONT)
         when :INT, :TERM, :QUIT
           log "Shutting down..."
           kill_all_listeners(signal)
@@ -158,7 +166,7 @@ module Resqued
       end while true
     end
 
-    SIGNALS = [ :HUP, :INT, :TERM, :QUIT ]
+    SIGNALS = [ :HUP, :INT, :USR2, :CONT, :TERM, :QUIT ]
     OPTIONAL_SIGNALS = [ :INFO ]
     OTHER_SIGNALS = [:CHLD, 'EXIT']
     TRAPS = SIGNALS + OPTIONAL_SIGNALS + OTHER_SIGNALS

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio