blaxter-delayed_job 2.0.6 → 2.0.7

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/lib/delayed/job.rb

@@ -172,18 +172,27 @@ module Delayed
     # Reschedule the job in the future (when a job fails).
     # Uses an exponential scale depending on the number of failed attempts.
     def reschedule(message, backtrace = [], time = nil)
+      self.last_error = ([message] + backtrace).join("\n")
       max_attempts = payload_object.send(:max_attempts) rescue MAX_ATTEMPTS
       if self.attempts < max_attempts
         time ||= Job.db_time_now + (attempts ** 4) + 5
 
-        self.attempts    += 1
-        self.run_at       = time unless self.attempts == max_attempts
-        self.last_error   = message + "\n" + backtrace.join("\n")
+        self.attempts += 1
+        self.run_at    = time unless self.attempts == max_attempts
         self.unlock
         save!
       else
-        Delayed::Worker.logger.info "* [JOB] PERMANENTLY removing #{self.name} because of #{attempts} consequetive failures."
-        destroy_failed_jobs ? destroy : update_attribute(:failed_at, Time.now)
+        if self.attempts > 0
+          Delayed::Worker.logger.info "* [JOB] PERMANENTLY removing #{self.name} because of #{attempts} consequetive failures."
+        else
+          Delayed::Worker.logger.info "* [JOB] PERMANENTLY removing #{self.name} because no attempts for this job"
+        end
+        if destroy_failed_jobs
+          destroy
+        else
+          self.failed_at = Time.now
+          save!
+        end
       end
     end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +39,10 @@ files:
 - lib/delayed/performable_method.rb
 - lib/delayed/worker.rb
 - lib/delayed_job.rb
+- spec/delayed_method_spec.rb
+- spec/story_spec.rb
+- spec/database.rb
+- spec/job_spec.rb
 has_rdoc: true
 homepage: http://github.com/blaxter/delayed_job
 licenses: []
@@ -51,23 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7.pre.1
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify