resqued 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae73470c551f27a4848c17b82495aa3796d604c
-  data.tar.gz: 195b59de0a56db9d9f4a8cedc7021b89e08bb38d
+  metadata.gz: ea3c0cf8313a982fc5c760f5ae8f7d6b7ed011d1
+  data.tar.gz: d9f06f7f2149de4cf608dc696a4e4bcf5cc77719
 SHA512:
-  metadata.gz: fda785e004ce32e7cfae246c8189d60ec26124594a6f5032698e30d633e266af3112cc24430249cb508552348b8ee15cf7fd470b45b842ae04de9a005d82df6b
-  data.tar.gz: fbd9e34d38907b72014ffaf3c0b58f8305ed803445dc48de245a1027de74c3cd002f0c90dc7c333d8d7c0d3812084f02b6146a273b0c3981d058079db64879fa
+  metadata.gz: 63277a13dd24c301ab7d389600bccd710cf67b4357ebeb33c14e673fdb076e265171a1a938a747f8a7d79007c8eb5e2376092af17f504c9c78ea3a3bca08e2d6
+  data.tar.gz: 7a41b8ef12b7962434887cc2498e4c69d2699bf186c160237fb829bf901efb4b969962c2a79455ce4cfb21deff71d923247e9fb0163bde07ac426e56f98e9617

data/CHANGES.md

@@ -1,5 +1,9 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.8.5
+------
+* Accept a custom proc to create the worker object.
+
 v0.8.4
 ------
 * Use `Integer` in place of `Fixnum`, when it's available.

data/lib/resqued/config/dsl.rb

@@ -20,6 +20,10 @@ module Resqued
       def worker_pool(count, *queues_and_options)
       end
 
+      # Public: Define a factory Proc that creates Resque::Workers
+      def worker_factory(&block)
+      end
+
       # Public: Define the queues worked by members of the worker pool.
       def queue(*queues)
       end

data/lib/resqued/config/worker.rb

@@ -36,6 +36,14 @@ module Resqued
         queues.each { |q| queue q }
       end
 
+      # DSL: Define a factory Proc used to create Resque::Workers. The factory
+      # Proc receives a list of queues as an argument.
+      #
+      #    worker_factory { |queues| Resque::Worker.new(*queues) }
+      def worker_factory(&block)
+        @worker_options.merge!(worker_factory: block)
+      end
+
       # DSL: Define a queue for the worker_pool to work from.
       #
       #     queue 'one'

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

data/lib/resqued/worker.rb

@@ -8,11 +8,19 @@ module Resqued
   class Worker
     include Resqued::Logging
 
+    DEFAULT_WORKER_FACTORY = ->(queues) {
+      resque_worker = Resque::Worker.new(*queues)
+      resque_worker.term_child = true if resque_worker.respond_to?('term_child=')
+      Resque.redis.client.reconnect
+      resque_worker
+    }
+
     def initialize(options)
       @queues = options.fetch(:queues)
       @config = options.fetch(:config)
       @interval = options[:interval]
       @backoff = Backoff.new
+      @worker_factory = options.fetch(:worker_factory, DEFAULT_WORKER_FACTORY)
       @pids = []
     end
 
@@ -80,9 +88,7 @@ module Resqued
         Resqued::Listener::ALL_SIGNALS.each { |signal| trap(signal, 'DEFAULT') }
         trap(:QUIT) { exit! 0 } # If we get a QUIT during boot, just spin back down.
         $0 = "STARTING RESQUE FOR #{queues.join(',')}"
-        resque_worker = Resque::Worker.new(*queues)
-        resque_worker.term_child = true if resque_worker.respond_to?('term_child=')
-        Resque.redis.client.reconnect
+        resque_worker = @worker_factory.call(queues)
         @config.after_fork(resque_worker)
         resque_worker.work(@interval || 5)
         exit 0

data/spec/resqued/config/worker_spec.rb

@@ -140,6 +140,29 @@ describe Resqued::Config::Worker do
     it { expect(result[3]).to eq(:queues => ['*']) }
   end
 
+  context 'worker factory' do
+    let(:config) { <<-END_CONFIG }
+      worker_factory { |queues| queues }
+      worker 'a'
+    END_CONFIG
+
+    it { expect(result.size).to eq(1) }
+    it { expect(result[0].reject { |k, _| k == :worker_factory}).to eq(:queues => ['a']) }
+    it { expect(result[0][:worker_factory].call(result[0][:queues])).to eq(['a']) }
+  end
+
+  context 'worker factory with pool' do
+    let(:config) { <<-END_CONFIG }
+      worker_factory { |queues| queues }
+      worker_pool 1
+      queue 'a'
+    END_CONFIG
+
+    it { expect(result.size).to eq(1) }
+    it { expect(result[0].reject { |k, _| k == :worker_factory}).to eq(:queues => ['a']) }
+    it { expect(result[0][:worker_factory].call(result[0][:queues])).to eq(['a']) }
+  end
+
   context 'with default options' do
     let(:evaluator) { described_class.new(:worker_class => FakeWorker, :config => 'something') }
     let(:config) { <<-END_CONFIG }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -156,22 +156,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Daemon of resque workers
 test_files:
-- spec/resqued/sleepy_spec.rb
-- spec/resqued/backoff_spec.rb
-- spec/resqued/config/worker_spec.rb
-- spec/resqued/config/fork_event_spec.rb
-- spec/resqued/start_ctx_spec.rb
-- spec/resqued/config_spec.rb
-- spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
+- spec/support/custom_matchers.rb
+- spec/fixtures/test_case_clean.rb
 - spec/fixtures/test_case_before_fork_raises.rb
 - spec/fixtures/test_case_environment.rb
 - spec/fixtures/test_case_no_workers.rb
 - spec/fixtures/test_case_after_fork_raises.rb
-- spec/fixtures/test_case_clean.rb
-- spec/support/custom_matchers.rb
+- spec/resqued/config_spec.rb
+- spec/resqued/config/fork_event_spec.rb
+- spec/resqued/config/worker_spec.rb
+- spec/resqued/sleepy_spec.rb
+- spec/resqued/test_case_spec.rb
+- spec/resqued/start_ctx_spec.rb
+- spec/resqued/backoff_spec.rb