delayed_job 2.0.7 → 2.0.8

data/README.textile

@@ -41,6 +41,10 @@ script/plugin install git://github.com/collectiveidea/delayed_job.git -r v2.0
 
 After delayed_job is installed, you will need to setup the backend.
 
+h3. Dependencies
+
+delayed_job depends upon version 1.0.10 of the daemons gem. delayed_job is incompatible with the newest (1.1.0) daemons gem.
+
 h2. Backends
 
 delayed_job supports multiple backends for storing the job queue. There are currently implementations for Active Record, MongoMapper, and DataMapper.

data/lib/delayed/backend/base.rb

@@ -1,8 +1,5 @@
 module Delayed
   module Backend
-    class DeserializationError < StandardError
-    end
-
     module Base
       def self.included(base)
         base.extend ClassMethods
@@ -107,7 +104,7 @@ module Delayed
 
         raise DeserializationError,
           'Job failed to load: Unknown handler. Try to manually require the appropriate file.'
-      rescue TypeError, LoadError, NameError => e
+      rescue TypeError, LoadError, NameError, ArgumentError => e
         raise DeserializationError,
           "Job failed to load: #{e.message}. Try to manually require the required file."
       end

data/lib/delayed/command.rb

@@ -47,6 +47,9 @@ module Delayed
         opts.on('--sleep-delay N', "Amount of time to sleep when no jobs are found") do |n|
           @options[:sleep_delay] = n
         end
+        opts.on('-p', '--prefix NAME', "String to be prefixed to worker process names") do |prefix|
+          @options[:prefix] = prefix
+        end
       end
       @args = opts.parse!(args)
     end
@@ -76,6 +79,7 @@ module Delayed
     
     def run_process(process_name, dir)
       Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :monitor => @monitor, :ARGV => @args) do |*args|
+        $0 = File.join @options[:prefix], process_name if @options[:prefix]
         run process_name
       end
     end

data/lib/delayed/deserialization_error.rb

@@ -0,0 +1,4 @@
+module Delayed
+  class DeserializationError < StandardError
+  end
+end

data/lib/delayed/worker.rb

@@ -124,8 +124,11 @@ module Delayed
       end
       say "#{job.name} completed after %.4f" % runtime
       return true  # did work
-    rescue Exception => e
-      handle_failed_job(job, e)
+    rescue DeserializationError => error
+      job.last_error = "{#{error.message}\n#{error.backtrace.join('\n')}"
+      failed(job)
+    rescue Exception => error
+      handle_failed_job(job, error)
       return false  # work failed
     end
     
@@ -138,14 +141,21 @@ module Delayed
         job.save!
       else
         say "PERMANENTLY removing #{job.name} because of #{job.attempts} consecutive failures.", Logger::INFO
+        failed(job)
+      end
+    end
 
+    def failed(job)
+      begin
         if job.payload_object.respond_to? :on_permanent_failure
-          say "Running on_permanent_failure hook"
-          job.payload_object.on_permanent_failure
+            say "Running on_permanent_failure hook"
+            job.payload_object.on_permanent_failure
         end
-
-        self.class.destroy_failed_jobs ? job.destroy : job.update_attributes(:failed_at => Delayed::Job.db_time_now)
+      rescue DeserializationError
+        # do nothing
       end
+      
+      self.class.destroy_failed_jobs ? job.destroy : job.update_attributes(:failed_at => Delayed::Job.db_time_now)
     end
 
     def say(text, level = Logger::INFO)

data/lib/delayed_job.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/delayed/message_sending'
 require File.dirname(__FILE__) + '/delayed/performable_method'
 require File.dirname(__FILE__) + '/delayed/backend/base'
 require File.dirname(__FILE__) + '/delayed/worker'
+require File.dirname(__FILE__) + '/delayed/deserialization_error'
 require File.dirname(__FILE__) + '/delayed/railtie' if defined?(::Rails::Railtie)
 
 Object.send(:include, Delayed::MessageSending)   

data/spec/backend/shared_backend_spec.rb

@@ -52,31 +52,36 @@ shared_examples_for 'a backend' do
                    
   it "should raise an DeserializationError when the job class is totally unknown" do
     job = @backend.new :handler => "--- !ruby/object:JobThatDoesNotExist {}"
-    lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
+  end
+
+  it "should raise an DeserializationError when the job is badly encoded" do
+    job = @backend.new :handler => "--- !ruby/object:SimpleJob {"
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
 
   it "should try to load the class when it is unknown at the time of the deserialization" do
     job = @backend.new :handler => "--- !ruby/object:JobThatDoesNotExist {}"
     job.should_receive(:attempt_to_load).with('JobThatDoesNotExist').and_return(true)
-    lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
 
   it "should try include the namespace when loading unknown objects" do
     job = @backend.new :handler => "--- !ruby/object:Delayed::JobThatDoesNotExist {}"
     job.should_receive(:attempt_to_load).with('Delayed::JobThatDoesNotExist').and_return(true)
-    lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
 
   it "should also try to load structs when they are unknown (raises TypeError)" do
     job = @backend.new :handler => "--- !ruby/struct:JobThatDoesNotExist {}"
     job.should_receive(:attempt_to_load).with('JobThatDoesNotExist').and_return(true)
-    lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
 
   it "should try include the namespace when loading unknown structs" do
     job = @backend.new :handler => "--- !ruby/struct:Delayed::JobThatDoesNotExist {}"
     job.should_receive(:attempt_to_load).with('Delayed::JobThatDoesNotExist').and_return(true)
-    lambda { job.payload_object.perform }.should raise_error(Delayed::Backend::DeserializationError)
+    lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
   
   describe "find_available" do
@@ -314,4 +319,23 @@ shared_examples_for 'a backend' do
       @job.max_attempts.should == 99
     end 
   end
+
+  describe "worker integration" do
+    before do
+      @worker = Delayed::Worker.new(:max_priority => nil, :min_priority => nil, :quiet => true)
+    end
+
+    describe "running a job" do
+
+      context "when the job raises a deserialization error" do
+        it "should mark the job as failed" do
+          Delayed::Worker.destroy_failed_jobs = false
+          job = described_class.create! :handler => "--- !ruby/object:JobThatDoesNotExist {}"
+          @worker.work_off
+          job.reload
+          job.failed_at.should_not be_nil
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,242 +1,256 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delayed_job
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 2.0.8
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 7
-  version: 2.0.7
 platform: ruby
-authors: 
+authors:
 - Chris Gaffney
 - Brandon Keepers
-- "Tobias L\xC3\xBCtke"
+- Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-10 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2013-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.0.10
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: mysql
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: mongo_mapper
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
   name: dm-core
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: dm-observer
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: dm-aggregates
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: dm-validations
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: do_sqlite3
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
-  prerelease: 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: database_cleaner
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id014
-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.
-  
-  This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job).
-email: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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.
+
+
+  This gem is collectiveidea''s fork (http://github.com/collectiveidea/delayed_job).'
+email:
 - chris@collectiveidea.com
 - brandon@opensoul.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - contrib/delayed_job.monitrc
 - contrib/delayed_job_multiple.monitrc
 - lib/delayed/backend/active_record.rb
@@ -244,6 +258,7 @@ files:
 - lib/delayed/backend/data_mapper.rb
 - lib/delayed/backend/mongo_mapper.rb
 - lib/delayed/command.rb
+- lib/delayed/deserialization_error.rb
 - lib/delayed/message_sending.rb
 - lib/delayed/performable_method.rb
 - lib/delayed/railtie.rb
@@ -273,44 +288,41 @@ files:
 - tasks/jobs.rake
 - MIT-LICENSE
 - README.textile
-has_rdoc: true
 homepage: http://github.com/collectiveidea/delayed_job
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.textile
 - --inline-source
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -534603219747213173
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -534603219747213173
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
-test_files: 
+test_files:
 - spec/backend/active_record_job_spec.rb
 - spec/backend/data_mapper_job_spec.rb
 - spec/backend/mongo_mapper_job_spec.rb