delayed_job 4.0.0.beta2 → 4.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+4.0.0 - 2013-07-30
+==================
+* Rails 4 compatibility
+* Reverted threaded startup due to daemons incompatibilities
+* Attempt to recover from job reservation errors
+
 4.0.0.beta2 - 2013-05-28
 ========================
 * Rails 4 compatibility

data/CONTRIBUTING.md

@@ -7,7 +7,16 @@ If you find what looks like a bug:
   if anyone else had the same issue.
 * Check the "GitHub issue tracker":http://github.com/collectiveidea/delayed_job/issues/
   to see if anyone else has reported issue.
-* If you don't see anything, create an issue with information on how to reproduce it.
+* Make sure you are using the latest version of delayed_job
+  ![Gem Version](https://badge.fury.io/rb/delayed_job.png)
+* Make sure you are using the latest backend gem for delayed_job
+  * Active Record ![Gem Version](https://badge.fury.io/rb/delayed_job_active_record.png)
+  * Mongoid ![Gem Version](https://badge.fury.io/rb/delayed_job_mongoid.png)
+* If you are still having an issue, create an issue including:
+  * Ruby version
+  * Gemfile.lock contents or at least major gem versions, such as Rails version
+  * Steps to reproduce the issue
+  * Full backtrace for any errors encountered
 
 If you want to contribute an enhancement or a fix:
 

data/README.md

@@ -316,6 +316,8 @@ By default all jobs are scheduled with priority = 0, which is top priority. You
 
 The default behavior is to read 5 jobs from the queue when finding an available job. You can configure this by setting Delayed::Worker.read_ahead.
 
+By default all jobs will be queued without a named queue. A default named queue can be specified by using Delayed::Worker.default_queue_name.
+
 It is possible to disable delayed jobs for testing purposes. Set Delayed::Worker.delay_jobs = false to execute all jobs realtime.
 
 Here is an example of changing job parameters in Rails:
@@ -327,6 +329,7 @@ Delayed::Worker.sleep_delay = 60
 Delayed::Worker.max_attempts = 3
 Delayed::Worker.max_run_time = 5.minutes
 Delayed::Worker.read_ahead = 10
+Delayed::Worker.default_queue_name = 'default'
 Delayed::Worker.delay_jobs = !Rails.env.test?
 ```
 

data/delayed_job.gemspec

@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '4.0.0.beta2'
+  spec.version        = '4.0.0'
 end

data/lib/delayed/backend/base.rb

@@ -47,6 +47,10 @@ module Delayed
           end
         end
 
+        # Allow the backend to attempt recovery from reserve errors
+        def recover_from(error)
+        end
+
         # Hook method that is called before a new worker is forked
         def before_fork
         end
@@ -82,7 +86,13 @@ module Delayed
       end
 
       def payload_object
-        @payload_object ||= YAML.load(self.handler)
+        if YAML.respond_to?(:unsafe_load)
+          #See https://github.com/dtao/safe_yaml
+          #When the method is there, we need to load our YAML like this...
+          @payload_object ||= YAML.load(self.handler, :safe => false)
+        else
+          @payload_object ||= YAML.load(self.handler)
+        end
       rescue TypeError, LoadError, NameError, ArgumentError => e
         raise DeserializationError,
           "Job failed to load: #{e.message}. Handler: #{handler.inspect}"

data/lib/delayed/backend/shared_spec.rb

@@ -399,7 +399,7 @@ shared_examples_for "a delayed_job backend" do
     end
 
     it "uses the max_retries value on the payload when defined" do
-      @job.payload_object.stub!(:max_attempts).and_return(99)
+      @job.payload_object.stub(:max_attempts).and_return(99)
       expect(@job.max_attempts).to eq(99)
     end
   end
@@ -504,8 +504,8 @@ shared_examples_for "a delayed_job backend" do
 
       it "does not fail when the triggered error doesn't have a message" do
         error_with_nil_message = StandardError.new
-        error_with_nil_message.stub!(:message).and_return nil
-        @job.stub!(:invoke_job).and_raise error_with_nil_message
+        error_with_nil_message.stub(:message).and_return nil
+        @job.stub(:invoke_job).and_raise error_with_nil_message
         expect{worker.run(@job)}.not_to raise_error
       end
     end
@@ -548,7 +548,7 @@ shared_examples_for "a delayed_job backend" do
           it "does not try to run that hook" do
             expect {
               Delayed::Worker.max_attempts.times { worker.reschedule(@job) }
-            }.not_to raise_exception(NoMethodError)
+            }.not_to raise_exception
           end
         end
       end

data/lib/delayed/command.rb

@@ -78,14 +78,10 @@ module Delayed
         process_name = "delayed_job.#{@options[:identifier]}"
         run_process(process_name, dir)
       else
-        threads = []
         worker_count.times do |worker_index|
-          threads << Thread.start do
-            process_name = worker_count == 1 ? "delayed_job" : "delayed_job.#{worker_index}"
-            run_process(process_name, dir)
-          end
+          process_name = worker_count == 1 ? "delayed_job" : "delayed_job.#{worker_index}"
+          run_process(process_name, dir)
         end
-        threads.each(&:join)
       end
     end
 

data/lib/delayed/worker.rb

@@ -107,6 +107,7 @@ module Delayed
 
     def initialize(options={})
       @quiet = options.has_key?(:quiet) ? options[:quiet] : true
+      @failed_reserve_count = 0
 
       [:min_priority, :max_priority, :sleep_delay, :read_ahead, :queues, :exit_on_complete].each do |option|
         self.class.send("#{option}=", options[option]) if options.has_key?(option)
@@ -262,9 +263,21 @@ module Delayed
     # Run the next job we can get an exclusive lock on.
     # If no jobs are left we return nil
     def reserve_and_run_one_job
-      job = Delayed::Job.reserve(self)
+      job = reserve_job
       self.class.lifecycle.run_callbacks(:perform, self, job){ run(job) } if job
     end
+
+    def reserve_job
+      job = Delayed::Job.reserve(self)
+      @failed_reserve_count = 0
+      job
+    rescue Exception => error
+      say "Error while reserving job: #{error}"
+      Delayed::Job.recover_from(error)
+      @failed_reserve_count += 1
+      raise FatalBackendError if @failed_reserve_count >= 10
+      nil
+    end
   end
 
 end

data/spec/lifecycle_spec.rb

@@ -4,7 +4,7 @@ describe Delayed::Lifecycle do
   let(:lifecycle) { Delayed::Lifecycle.new }
   let(:callback) { lambda {|*args|} }
   let(:arguments) { [1] }
-  let(:behavior) { mock(Object, :before! => nil, :after! => nil, :inside! => nil) }
+  let(:behavior) { double(Object, :before! => nil, :after! => nil, :inside! => nil) }
   let(:wrapped_block) { Proc.new { behavior.inside! } }
 
   describe "before callbacks" do

data/spec/performable_mailer_spec.rb

@@ -30,8 +30,8 @@ describe ActionMailer::Base do
   describe Delayed::PerformableMailer do
     describe "perform" do
       it "calls the method and #deliver on the mailer" do
-        email = mock('email', :deliver => true)
-        mailer_class = mock('MailerClass', :signup => email)
+        email = double('email', :deliver => true)
+        mailer_class = double('MailerClass', :signup => email)
         mailer = Delayed::PerformableMailer.new(mailer_class, :signup, ['john@example.com'])
 
         mailer_class.should_receive(:signup).with('john@example.com')

data/spec/performable_method_spec.rb

@@ -36,7 +36,7 @@ describe Delayed::PerformableMethod do
     end
     expect {
       Delayed::PerformableMethod.new(clazz.new, :private_method, [])
-    }.not_to raise_error(NoMethodError)
+    }.not_to raise_error
   end
 
   describe "hooks" do

data/spec/worker_spec.rb

@@ -24,7 +24,7 @@ describe Delayed::Worker do
   describe "job_say" do
     before do
       @worker = Delayed::Worker.new
-      @job = stub('job', :id => 123, :name => 'ExampleJob')
+      @job = double('job', :id => 123, :name => 'ExampleJob')
     end
 
     it "logs with job name and id" do
@@ -71,4 +71,32 @@ describe Delayed::Worker do
       end
     end
   end
+
+  context "worker job reservation" do
+    before do
+      Delayed::Worker.exit_on_complete = true
+    end
+
+    after do
+      Delayed::Worker.exit_on_complete = false
+    end
+
+    it "handles error during job reservation" do
+      Delayed::Job.should_receive(:reserve).and_raise(Exception)
+      Delayed::Worker.new.work_off
+    end
+
+    it "gives up after 10 backend failures" do
+      Delayed::Job.stub(:reserve).and_raise(Exception)
+      worker = Delayed::Worker.new
+      9.times { worker.work_off }
+      expect(lambda { worker.work_off }).to raise_exception
+    end
+
+    it "allows the backend to attempt recovery from reservation errors" do
+      Delayed::Job.should_receive(:reserve).and_raise(Exception)
+      Delayed::Job.should_receive(:recover_from).with(instance_of(Exception))
+      Delayed::Worker.new.work_off
+    end
+  end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Brandon Keepers
@@ -15,12 +16,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,7 +29,10 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,7 +40,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
-  type: :runtime
 description: Delayed_job (or DJ) encapsulates the common pattern of asynchronously
   executing longer tasks in the background. It is a direct extraction from Shopify
   where the job table is responsible for a multitude of core tasks.
@@ -98,26 +101,33 @@ files:
 homepage: http://github.com/collectiveidea/delayed_job
 licenses:
 - MIT
-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'
+      segments:
+      - 0
+      hash: 3979399263094595498
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3979399263094595498
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
 test_files:
 - spec/autoloaded/clazz.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTQxN2VkZDVhM2YxY2RhNzE0NzRiN2ZlMDE0ZmQ3Y2I3ZjM5ODkyMA==
-  data.tar.gz: !binary |-
-    NjI3N2EyYTkzY2E2M2YyNmE2OWYxNTVhOWZkNWI5ZGViZWEzYjIzNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjhjOGJkN2YxNGM0NzI0ZDIxOTE0ZGVjNTk0OGZhZWQxZmY4YTkxYTczNWRk
-    ZWIxNTEzYWE4Mzc4OGE0Mjc2NzhhMDQ0NjdiZGVjMDc1YzEyMDUyOTFmYmRl
-    OTdmNzYyZDQ4YzJjZWVlOGUzNjczY2VlOTczYTc5Mjk1ZjhjZTE=
-  data.tar.gz: !binary |-
-    MDcxN2FkZDMxYWVhOTI2NjBmN2FmNzgyN2I0MTZkMmM3YmNjZWM4NTk2MzVl
-    ZDA2ZWQ1ZWE4YTE3OGI0ZDlmMTNjMGQ0ZDgyNTllNWM1OTczNzQxNWY3ZTFk
-    NjFkM2ZjMGEzOGYyMTQzNjNhMjg5ODRjNGEzNTExNGM2YjJiZGE=