chore-core 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a706f2f8f8eefe36f16cfaea8636f6fe13df8d
-  data.tar.gz: d4c0b0f97c85916e509ec609bd9a9e38cac6aac0
+  metadata.gz: 8a1e15581a9bd8310bd8d1f4ae4392f35df44afd
+  data.tar.gz: 72776fab3cc9fc4013c9c0a80f55dddb2bef7277
 SHA512:
-  metadata.gz: c92dcbc42098e17b5e1d3ac05860ca1b74022725a2839964f6480bc8c3f080555e950757997ad9d3d4cdbd4b122e02e467614bb481a4108dfe65c5a74b797c6c
-  data.tar.gz: 95baf93fe723268b499447c24464443e3e7e19ed62d5718394c7dae66bcafb44a33f47133b3973827efd5856acc4fee2aab795adc33515c18068807f9e5039aa
+  metadata.gz: 4b3f27a13ae37b90e18b693bffe1d09f36ab9cdf33ca1ce0a0d9d69fb9c9a1d60836f54ed963549ec6103c59f02e8a95e824b40397489c8ec44c042000e856be
+  data.tar.gz: 4beb0d44d569c8eaea6306cd5bab3dd0f89f2ddd59892aa6b3ab5dc9c4f17107eb6fbaa6fab45530ba2c7e87b7eede5737f41d9f2727df6238de9a10998166f7

data/lib/chore/strategies/worker/single_worker_strategy.rb

@@ -10,7 +10,10 @@ module Chore
       def initialize(manager, opts={})
         @options = opts
         @manager = manager
+        @stopped = false
         @worker = nil
+        @queue = Queue.new
+        @queue << :worker
       end
 
       # Starts the <tt>SingleWorkerStrategy</tt>. Currently a noop
@@ -18,6 +21,11 @@ module Chore
 
       # Stops the <tt>SingleWorkerStrategy</tt> if there is a worker to stop
       def stop!
+        return if @stopped
+
+        @stopped = true
+        Chore.logger.info { "Manager #{Process.pid} stopping" }
+
         worker.stop! if worker
       end
 
@@ -25,16 +33,14 @@ module Chore
       # single worker strategy, this should never be called if the worker is in
       # progress.
       def assign(work)
-        if workers_available?
-          begin
-            @worker = worker_klass.new(work, @options)
-            @worker.start
-            true
-          ensure
-            @worker = nil
-          end
-        else
-          Chore.logger.error { "#{self.class}#assign: single worker is unavailable, but assign has been re-entered: #{caller * "\n"}" }
+        return unless acquire_worker
+
+        begin
+          @worker = worker_klass.new(work, @options)
+          @worker.start
+          true
+        ensure
+          release_worker
         end
       end
 
@@ -42,9 +48,25 @@ module Chore
         Worker
       end
 
-      # Returns true if there is currently no worker
-      def workers_available?
-        @worker.nil?
+      private
+
+      # Attempts to essentially acquire a lock on a worker.  If no workers are
+      # available, then this will block until one is.
+      def acquire_worker
+        result = @queue.pop
+
+        if @stopped
+          # Strategy has stopped since the worker was acquired
+          release_worker
+          nil
+        else
+          result
+        end
+      end
+
+      # Releases the lock on a worker so that another thread can pick it up.
+      def release_worker
+        @queue << :worker
       end
     end
   end

data/lib/chore/version.rb

@@ -2,7 +2,7 @@ module Chore
   module Version #:nodoc:
     MAJOR = 1
     MINOR = 8
-    PATCH = 2
+    PATCH = 3
 
     STRING = [ MAJOR, MINOR, PATCH ].join('.')
   end

data/spec/chore/strategies/worker/single_worker_strategy_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Chore::Strategy::SingleWorkerStrategy do
   let(:manager) { double('Manager') }
+  let(:job_timeout) { 60 }
+  let(:job) { Chore::UnitOfWork.new(SecureRandom.uuid, 'test', job_timeout, Chore::Encoder::JsonEncoder.encode(TestJob.job_hash([1,2,"3"])), 0) }
   subject       { described_class.new(manager) }
 
   describe '#stop!' do
@@ -31,4 +33,27 @@ describe Chore::Strategy::SingleWorkerStrategy do
     end
   end
 
+  describe '#assign' do
+    let(:worker) { double('Worker', start: nil) }
+
+    it 'starts a new worker' do
+      expect(Chore::Worker).to receive(:new).with(job, {}).and_return(worker)
+      subject.assign(job)
+    end
+
+    it 'can be called multiple times' do
+      expect(Chore::Worker).to receive(:new).twice.with(job, {}).and_return(worker)
+      2.times { subject.assign(job) }
+    end
+
+    it 'should release the worker if an exception occurs' do
+      allow_any_instance_of(Chore::Worker).to receive(:start).and_raise(ArgumentError)
+      expect(subject).to receive(:release_worker)
+
+      begin
+        subject.assign(job)
+      rescue ArgumentError
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chore-core
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Tapjoy