chore-core 1.8.4 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ab52748f634684d65e8eb548ba12cf3a8020e5
-  data.tar.gz: d09aba8b0de7b845e4adb3fc503c277af494e174
+  metadata.gz: 0800ed952e9c16ccde3058ff9db8a4b9a72adf44
+  data.tar.gz: b24b312e93158e7942ae11896d9680f9f8a7714d
 SHA512:
-  metadata.gz: 050d7fdf8d36d4a2effe4808690bd28b399b9f1634c24aef19fec0b7971804fa587cda8bbdc3d92b97ecec421d87659ceaead9c860954979c26369b8d00a609c
-  data.tar.gz: d046c3fc0a634074dbfff548a5b9dc69e95d330a35259be6552414447459bdeb10d0b0bef1de348f70f7c5e5641d6a447d92094f1fda0108861f58c4f76f83a4
+  metadata.gz: 86f131b78103e360f0219b7b55a53da68338e676791dedcea638130e38e132665a4d33cf2bd0f90e78957184dd8b9d19ea88b7801866097b276d113debb654bd
+  data.tar.gz: 5f32aa7d1db7aab0579b1bfb43c31497502f76964e71e4d9faf0d6c1230be157901694602cb8a76f82e6c7627d2a74337e82f377a71652f03cbd18f1dfd4b23f

data/lib/chore/queues/filesystem/consumer.rb

@@ -108,7 +108,7 @@ module Chore
 
         def complete(id)
           Chore.logger.debug "Completing (deleting): #{id}"
-          FileUtils.rm(File.join(@in_progress_dir, id))
+          FileUtils.rm_f(File.join(@in_progress_dir, id))
         end
 
         private

data/lib/chore/queues/filesystem/publisher.rb

@@ -16,6 +16,9 @@ module Chore
         # use of mutex and file locking should make this both threadsafe and safe for multiple
         # processes to use the same queue directory simultaneously. 
         def publish(queue_name,job)
+          # First try encoding the job to avoid writing empty job files if this fails
+          encoded_job = encode_job(job)
+
           FILE_MUTEX.synchronize do
             while true
               # keep trying to get a file with nothing in it meaning we just created it
@@ -23,10 +26,7 @@ module Chore
               f = File.open(filename(queue_name, job[:class].to_s), "w")
               if f.flock(File::LOCK_EX | File::LOCK_NB) && f.size == 0
                 begin
-                  f.write(job.to_json)
-                rescue StandardError => e
-                  Chore.logger.error "#{e.class.name}: #{e.message}. Could not write #{job[:class]} job to '#{queue_name}' queue file."
-                  Chore.logger.error e.backtrace.join("\n")
+                  f.write(encoded_job)
                 ensure
                   f.flock(File::LOCK_UN)
                 end

data/lib/chore/version.rb

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

data/lib/chore/worker.rb

@@ -66,6 +66,7 @@ module Chore
             item.consumer.complete(item.id)
           else
             Chore.run_hooks_for(:on_failure,item.message,e)
+            item.consumer.reject(item.id)
           end
         end
       end
@@ -116,6 +117,7 @@ module Chore
         item.consumer.complete(item.id)
       else
         klass.run_hooks_for(:on_failure, message, e)
+        item.consumer.reject(item.id)
       end
     end
 

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

@@ -8,8 +8,18 @@ describe Chore::Strategy::ForkedWorkerStrategy do
     allow(strategy).to receive(:exit!)
     strategy
   end
+  let(:consumer) { double('consumer', :complete => nil, :reject => nil) }
   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) }
+  let(:job) do
+    Chore::UnitOfWork.new(
+      SecureRandom.uuid,
+      'test',
+      job_timeout,
+      Chore::Encoder::JsonEncoder.encode(TestJob.job_hash([1,2,"3"])),
+      0,
+      consumer
+    )
+  end
   let!(:worker) { Chore::Worker.new(job) }
   let(:pid) { Random.rand(2048) }
 

data/spec/chore/worker_spec.rb

@@ -13,7 +13,7 @@ describe Chore::Worker do
     end
   end
 
-  let(:consumer) { double('consumer', :complete => nil) }
+  let(:consumer) { double('consumer', :complete => nil, :reject => nil) }
   let(:job_args) { [1,2,'3'] }
   let(:job) { SimpleJob.job_hash(job_args) }
 
@@ -91,6 +91,12 @@ describe Chore::Worker do
         Chore::Worker.start(work)
       end
 
+      it 'should reject job' do
+        work = Chore::UnitOfWork.new(2,'test',60,job,0,consumer)
+        consumer.should_receive(:reject).with(2)
+        Chore::Worker.start(work)
+      end
+
       context 'more than the maximum allowed times' do
         before(:each) do
           Chore.config.stub(:max_attempts).and_return(10)
@@ -127,6 +133,13 @@ describe Chore::Worker do
         Chore::Worker.start(work)
       end
 
+      it 'should reject job' do
+        work = Chore::UnitOfWork.new(2,'test',60,encoded_job,0,consumer)
+        consumer.should_receive(:reject).with(2)
+
+        Chore::Worker.start(work)
+      end
+
       context 'more than the maximum allowed times' do
         it 'should permanently fail' do
           work = Chore::UnitOfWork.new(2,'test',60,encoded_job,999,consumer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chore-core
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0
 platform: ruby
 authors:
 - Tapjoy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -186,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Job processing... for the future!
 test_files: []
-has_rdoc: