resqued 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c970fdaa5c3ed98d5a08d4f8f9ae998a70fbb700
-  data.tar.gz: 40b205f1d8c8da17189ccd14b9848656db3a6f10
+  metadata.gz: d66bf0dfa9299a44f871ae9835183600f6cc4e79
+  data.tar.gz: 318a6d0ec20aebbaf97260c3f2253394187ae2e1
 SHA512:
-  metadata.gz: 4f3f703415a15b448da9d0372763ff789c532eae258018df43b471bab0a1eceec4482cd231feef99ec46929e50d29374fa5efb1c212bb56dab79ac0988e6e539
-  data.tar.gz: 5e2dfa51990c8f441187ed713fbd1cc534d82d00d4e2185d44ef22b06b063e6d776eb2ecda3c68bac04345311b3942ae8fd83acba669e2b2b5412013c0212653
+  metadata.gz: cd97e21578a9cddaf82210459dc148790ed65ba92cd92c0d013764b03826df4683414ec1bfe56eeb73ebfe1bfe0854ba49826885a94c0c1ea38461e82a4affce
+  data.tar.gz: d8b4de064f53197605f7fc64bec9954a0bc8f4003bcd0c7334581043941e6e4762d42db0ee823a6c7ac085eaf6eb990be6d660b4dfd733bf877be09aa698ef5d

data/README.md

@@ -37,8 +37,8 @@ To run the same fleet of workers with resqued, create a config file
 Another syntax for workers:
 
     worker_pool 5
-    queue 'low', '20%'
-    queue 'normal', '60%'
+    queue 'low', :percent => 20
+    queue 'normal', :percent => 60
     queue '*'
 
 This time, you'd end up with something similar to this:
@@ -96,8 +96,9 @@ You can configure the Resque worker in the `after_fork` block
     worker 'low', :interval => 30
 
     worker_pool 5, :interval => 1
-    queue 'low', '20%'
-    queue 'normal', 4
+    queue 'high', 'almosthigh'
+    queue 'low', :percent => 20
+    queue 'normal', :count => 4
     queue '*'
 
     before_fork do
@@ -114,11 +115,11 @@ You can configure the Resque worker in the `after_fork` block
 In this example, a Rails application is being set up with 7 workers:
 * high
 * low (interval = 30)
-* low, normal, * (interval = 1)
-* normal, * (interval = 1)
-* normal, * (interval = 1)
-* normal, * (interval = 1)
-* * (interval = 1)
+* high, almosthigh, low, normal, * (interval = 1)
+* high, almosthigh, normal, * (interval = 1)
+* high, almosthigh, normal, * (interval = 1)
+* high, almosthigh, normal, * (interval = 1)
+* high, almosthigh, * (interval = 1)
 
 ## Multiple configurations
 

data/lib/resqued/config/dsl.rb

@@ -21,7 +21,7 @@ module Resqued
       end
 
       # Public: Define the queues worked by members of the worker pool.
-      def queue(queue_name, concurrency = nil)
+      def queue(*queues)
       end
     end
   end

data/lib/resqued/config/worker.rb

@@ -40,25 +40,24 @@ module Resqued
       #
       #     queue 'one'
       #     queue '*'
-      #     queue 'two', '10%'
-      #     queue 'three', 5
-      #     queue 'four', :percent => 10
+      #     queue 'four-a', 'four-b', :percent => 10
       #     queue 'five', :count => 5
-      def queue(queue_name, concurrency = nil)
-        @pool_queues[queue_name] =
-          case concurrency
+      def queue(*queues)
+        options = queues.last.is_a?(Hash) ? queues.pop : {}
+        concurrency =
+          case options
           when Hash
-            if percent = concurrency[:percent]
+            if percent = options[:percent]
               percent * 0.01
-            elsif count = concurrency[:count]
+            elsif count = options[:count]
               count
             else
               1.0
             end
-          when nil, '';    1.0
-          when /%$/;       concurrency.chomp('%').to_i * 0.01
-          else             concurrency.to_i
+          else
+            1.0
           end
+        queues.each { |queue| @pool_queues[queue] = concurrency }
       end
 
       private

data/lib/resqued/listener.rb

@@ -4,6 +4,7 @@ require 'resqued/config'
 require 'resqued/logging'
 require 'resqued/procline_version'
 require 'resqued/sleepy'
+require 'resqued/version'
 require 'resqued/worker'
 
 module Resqued
@@ -32,6 +33,7 @@ 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
+      ENV['RESQUED_MASTER_VERSION'] = Resqued::VERSION
       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
@@ -67,6 +69,7 @@ module Resqued
 
       config = Resqued::Config.new(@config_paths)
       config.before_fork
+      report_to_master("RUNNING")
 
       write_procline('running')
       init_workers(config)

data/lib/resqued/listener_proxy.rb

@@ -67,16 +67,18 @@ module Resqued
 
     # Public: Check for updates on running worker information.
     def read_worker_status(options)
-      on_finished = options[:on_finished]
+      on_activity = options[:on_activity]
       until @master_socket.nil?
         IO.select([@master_socket], nil, nil, 0) or return
-        line = @master_socket.readline
-        if line =~ /^\+(\d+),(.*)$/
+        case line = @master_socket.readline
+        when /^\+(\d+),(.*)$/
           worker_pids[$1] = $2
-        elsif line =~ /^-(\d+)$/
+        when /^-(\d+)$/
           worker_pids.delete($1)
-          on_finished.worker_finished($1) if on_finished
-        elsif line == ''
+          on_activity.worker_finished($1) if on_activity
+        when /^RUNNING/
+          on_activity.listener_running(self) if on_activity
+        when ''
           break
         else
           log "Malformed data from listener: #{line.inspect}"

data/lib/resqued/master.rb

@@ -52,11 +52,12 @@ module Resqued
         when :HUP
           reopen_logs
           log "Restarting listener with new configuration and application."
-          kill_listener(:QUIT)
+          prepare_new_listener
         when :USR2
           log "Pause job processing"
           @paused = true
-          kill_listener(:QUIT)
+          kill_listener(:QUIT, @current_listener)
+          @current_listener = nil
         when :CONT
           log "Resume job processing"
           @paused = false
@@ -122,23 +123,53 @@ module Resqued
 
     def read_listeners
       all_listeners.each do |l|
-        l.read_worker_status(:on_finished => self)
+        l.read_worker_status(:on_activity => self)
       end
     end
 
+    # Listener message: A worker just stopped working.
+    #
+    # Forwards the message to the other listeners.
     def worker_finished(pid)
       all_listeners.each do |other|
         other.worker_finished(pid)
       end
     end
 
-    def kill_listener(signal)
-      if @current_listener
-        @current_listener.kill(signal)
-        @current_listener = nil
+    # Listener message: A listener finished booting, and is ready to start workers.
+    #
+    # Promotes a booting listener to be the current listener.
+    def listener_running(listener)
+      if listener == @current_listener
+        kill_listener(:QUIT, @last_good_listener)
+        @last_good_listener = nil
+      else
+        # This listener didn't receive the last SIGQUIT we sent.
+        # (It was probably sent before the listener had set up its traps.)
+        # So kill it again. We have moved on.
+        kill_listener(:QUIT, listener)
       end
     end
 
+    # Private: Spin up a new listener.
+    #
+    # The old one will be killed when the new one is ready for workers.
+    def prepare_new_listener
+      if @last_good_listener
+        # The last_good_listener is still running because we got another HUP before the new listener finished booting.
+        # Keep the last_good_listener (where all the workers are) and kill the booting current_listener. We'll start a new one.
+        kill_listener(:QUIT, @current_listener)
+      else
+        @last_good_listener = @current_listener
+      end
+      # Indicate to `start_listener` that it should start a new listener.
+      @current_listener = nil
+    end
+
+    def kill_listener(signal, listener)
+      listener.kill(signal) if listener
+    end
+
     def kill_all_listeners(signal)
       all_listeners.each do |l|
         l.kill(signal)

data/lib/resqued/version.rb

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

metadata

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