resqued 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e5a83c5ce92209fd4dc917cb9b85a145206047a
+  data.tar.gz: de4d9dabfe0a6f37e8b973faa0d436cde0618c90
+SHA512:
+  metadata.gz: a2bdc8dd96addce81a01ea4248c1471d75ed803142edfd32f166cb2e2d4a7683b08b848ea4bd513e3520a981d8dee6cd44f73a0cdacf3310336919b02e6ae07f
+  data.tar.gz: 4945877eb7e3c0312996d43cd447f271966d0cc97fefca9ef5ed8019d3cc587fb3ab1f8090326655be30550ff76745aca46ca682ddc65b91963ff5fd3f6d5d01

data/README.md

@@ -120,6 +120,13 @@ In this example, a Rails application is being set up with 7 workers:
 * normal, * (interval = 1)
 * * (interval = 1)
 
+## Multiple configurations
+
+If your app has several work machines, each with the same application code but different sets of workers, you might want to have a shared config file for the `before_fork` and `after_fork` blocks. You can pass in several config files, and resqued will act as if you concatenated them.
+
+    $ resqued config/shared.rb config/pool-a.rb
+    $ resqued config/shared.rb config/pool-b.rb
+
 ## See also
 
 For information about how resqued works, see the [documentation](docs/).

data/exe/resqued

@@ -4,9 +4,10 @@ require 'optparse'
 
 options = {}
 daemonize = false
+test = false
 
 opts = OptionParser.new do |opts|
-  opts.banner = "Usage: resqued [options] resqued-config-file"
+  opts.banner = "Usage: resqued [options] resqued-config-files..."
 
   opts.on '-h', '--help', 'Show this message' do
     puts opts
@@ -19,6 +20,10 @@ opts = OptionParser.new do |opts|
     exit
   end
 
+  opts.on '--test', 'Report which worker would start' do
+    test = true
+  end
+
   opts.on '-p', '--pidfile PIDFILE', 'Store the pid of the master process in PIDFILE' do |v|
     options[:master_pidfile] = v
   end
@@ -34,16 +39,26 @@ opts = OptionParser.new do |opts|
 end
 
 opts.parse!
+options[:config_paths] = ARGV
 
-unless options[:config_path] = ARGV[0]
+if options[:config_paths].size == 0
   puts opts
   exit 1
 end
 
-require 'resqued/master'
-resqued = Resqued::Master.new(options)
-if daemonize
-  require 'resqued/daemon'
-  resqued = Resqued::Daemon.new(resqued)
+if test
+  require 'resqued/config'
+  workers = Resqued::Config.new(options[:config_paths]).build_workers
+  puts "Workers defined in #{options[:config_paths].join(' ')}"
+  workers.each_with_index do |worker, index|
+    puts "#{index + 1}: #{worker.queues.join(',')}"
+  end
+else
+  require 'resqued/master'
+  resqued = Resqued::Master.new(options)
+  if daemonize
+    require 'resqued/daemon'
+    resqued = Resqued::Daemon.new(resqued)
+  end
+  resqued.run
 end
-resqued.run

data/lib/resqued/config/base.rb

@@ -15,6 +15,14 @@ module Resqued
         results
       end
 
+      # Public: Apply the configuration from several files.
+      def apply_all(configs)
+        configs.each do |config|
+          instance_eval(config[:content], config[:path])
+        end
+        results
+      end
+
       private
 
       # Private: The results of applying the config.

data/lib/resqued/config/dsl.rb

@@ -17,7 +17,7 @@ module Resqued
       end
 
       # Public: Define a pool of workers that will work '*', or the queues specified by `queue`.
-      def worker_pool(count, options = {})
+      def worker_pool(count, *queues_and_options)
       end
 
       # Public: Define the queues worked by members of the worker pool.

data/lib/resqued/config/worker.rb

@@ -1,4 +1,5 @@
 require 'resqued/config/base'
+require 'resqued/worker'
 
 module Resqued
   module Config
@@ -18,18 +19,21 @@ module Resqued
       #
       #     worker 'one', :interval => 1
       def worker(*queues)
-        options = queues.last.is_a?(Hash) ? queues.pop : {}
+        options = queues.last.is_a?(Hash) ? queues.pop.dup : {}
+        queues = queues.flatten
         queues = ['*'] if queues.empty?
-        @workers << @worker_class.new(options.merge(@worker_options).merge(:queues => queues.flatten))
+        queues = queues.shuffle if options.delete(:shuffle_queues)
+        @workers << @worker_class.new(options.merge(@worker_options).merge(:queues => queues))
       end
 
       # DSL: Set up a pool of workers. Define queues for the members of the pool with `queue`.
       #
       #     worker_pool 20, :interval => 1
-      def worker_pool(count, options = {})
+      def worker_pool(count, *queues)
         @pool_size = count
-        @pool_options = options
+        @pool_options = queues.last.is_a?(Hash) ? queues.pop : {}
         @pool_queues = {}
+        queues.each { |q| queue q }
       end
 
       # DSL: Define a queue for the worker_pool to work from.

data/lib/resqued/config.rb

@@ -7,30 +7,29 @@ module Resqued
     # Public: Build a new ConfigFile instance.
     #
     # Resqued::Config is a module because the evaluators say so, so this `new` is a factory for another class.
-    def self.new(*args)
-      ConfigFile.new(*args)
+    def self.new(paths)
+      Configuration.new(paths)
     end
 
     # Does the things that the config file says to do.
-    class ConfigFile
-      def initialize(config_path)
-        @path = config_path
-        @contents = File.read(@path)
+    class Configuration
+      def initialize(config_paths)
+        @config_data = config_paths.map { |path| {:content => File.read(path), :path => path} }
       end
 
       # Public: Performs the `before_fork` action from the config.
       def before_fork
-        Resqued::Config::BeforeFork.new.apply(@contents, @path)
+        Resqued::Config::BeforeFork.new.apply_all(@config_data)
       end
 
       # Public: Performs the `after_fork` action from the config.
       def after_fork(worker)
-        Resqued::Config::AfterFork.new(:worker => worker).apply(@contents, @path)
+        Resqued::Config::AfterFork.new(:worker => worker).apply_all(@config_data)
       end
 
       # Public: Builds the workers specified in the config.
       def build_workers
-        Resqued::Config::Worker.new(:config => self).apply(@contents, @path)
+        Resqued::Config::Worker.new(:config => self).apply_all(@config_data)
       end
     end
   end

data/lib/resqued/listener.rb

@@ -15,7 +15,7 @@ module Resqued
     #
     # Runs in the master process.
     def initialize(options)
-      @config_path     = options.fetch(:config_path)
+      @config_paths    = options.fetch(:config_paths)
       @running_workers = options.fetch(:running_workers) { [] }
       @socket          = options.fetch(:socket)
       @listener_id     = options.fetch(:listener_id) { nil }
@@ -25,11 +25,13 @@ module Resqued
     #
     # Runs in the master process.
     def exec
-      ENV['RESQUED_SOCKET']      = @socket.fileno.to_s
-      ENV['RESQUED_CONFIG_PATH'] = @config_path
+      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_LISTENER_ID'] = @listener_id.to_s
-      Kernel.exec('resqued-listener')
+      # This may not work in rubies earlier than 1.9.
+      Kernel.exec('resqued-listener', socket_fd => socket_fd)
     end
 
     # Public: Given args from #exec, start this listener.
@@ -39,7 +41,7 @@ module Resqued
         options[:socket] = Socket.for_fd(socket.to_i)
       end
       if path = ENV['RESQUED_CONFIG_PATH']
-        options[:config_path] = path
+        options[:config_paths] = path.split(':')
       end
       if state = ENV['RESQUED_STATE']
         options[:running_workers] = state.split('||').map { |s| Hash[[:pid,:queue].zip(s.split('|'))] }
@@ -59,8 +61,9 @@ module Resqued
       trap(:CHLD) { awake }
       SIGNALS.each { |signal| trap(signal) { SIGNAL_QUEUE << signal ; awake } }
       @socket.close_on_exec = true
+      write_procline('starting')
 
-      config = Resqued::Config.new(@config_path)
+      config = Resqued::Config.new(@config_paths)
       config.before_fork
 
       write_procline('running')
@@ -201,7 +204,7 @@ module Resqued
       procline = "resqued listener"
       procline << " #{@listener_id}" if @listener_id
       procline << " [#{status}]"
-      procline << " #{@config_path}"
+      procline << " #{@config_paths.join(' ')}"
       $0 = procline
     end
   end

data/lib/resqued/master.rb

@@ -15,8 +15,8 @@ module Resqued
     include Resqued::Sleepy
 
     def initialize(options)
-      @config_path = options.fetch(:config_path)
-      @pidfile     = options.fetch(:master_pidfile) { nil }
+      @config_paths = options.fetch(:config_paths)
+      @pidfile      = options.fetch(:master_pidfile) { nil }
       @listener_backoff = Backoff.new
       @listeners_created = 0
     end
@@ -97,12 +97,9 @@ module Resqued
       listener_pids.values
     end
 
-    attr_reader :config_path
-    attr_reader :pidfile
-
     def start_listener
       return if @current_listener || @listener_backoff.wait?
-      @current_listener = ListenerProxy.new(:config_path => @config_path, :running_workers => all_listeners.map { |l| l.running_workers }.flatten, :listener_id => next_listener_id)
+      @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_backoff.started
       listener_pids[@current_listener.pid] = @current_listener

data/lib/resqued/version.rb

@@ -1,4 +1,3 @@
 module Resqued
-  # Oh look, he's getting so big!
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/resqued/worker.rb

@@ -76,8 +76,8 @@ module Resqued
         end
         resque_worker = Resque::Worker.new(*queues)
         resque_worker.log "Starting worker #{resque_worker}"
-        resque_worker.term_child = true
-        resque_worker.reconnect
+        resque_worker.term_child = true if resque_worker.respond_to?('term_child=')
+        Resque.redis.client.reconnect
         @config.after_fork(resque_worker)
         resque_worker.work(@interval || 5)
         exit 0

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,17 +111,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Daemon of resque workers
@@ -169,26 +152,25 @@ files:
 - exe/resqued-listener
 homepage: https://github.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Daemon of resque workers
 test_files: []