blaxter-delayed_job 2.0.1 → 2.0.3

data/README.markdown

@@ -185,6 +185,8 @@ You can invoke `rake jobs:clear` to delete all jobs in the queue.
 
 Changes
 -------
+* 2.0.3: The only_for feature wasn't working at all
+* 2.0.2: Only update run_at when it's gonna be executed another time for sure (attempts < max_attempts)
 * 2.0.1: named_scope Delayed::Job.failed/finished/unfinished (jobs that have failed, have finished ok or still haven't been done)
 * 2.0.0: Contains the changes made in this fork, the ability to create workers with individual constraints without interfere to other workers
 

data/Rakefile

@@ -3,17 +3,17 @@ begin
   require 'jeweler'
 
   Jeweler::Tasks.new do |s|
-    s.name     = "delayed_job"
+    s.name     = "blaxter-delayed_job"
     s.summary  = "Database-backed asynchronous priority queue system -- Extracted from Shopify"
-    s.email    = "tobi@leetsoft.com"
-    s.homepage = "http://github.com/tobi/delayed_job/tree/master"
+    s.email    = "blaxter@gmail.com"
+    s.homepage = "http://github.com/blaxter/delayed_job"
     s.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."
-    s.authors  = ["Tobias Lütke"]
-    
+    s.authors  = ["Tobias Lütke", "Jesús García Sáez"]
+
     s.has_rdoc = true
     s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
     s.extra_rdoc_files = ["README.textile"]
-    
+
     s.test_files = Dir['spec/**/*']
   end
 
@@ -27,12 +27,12 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
- 
+
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
- 
- 
+
+
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

data/delayed_job.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job}
-  s.version = "2.0.1"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias L\303\274tke"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2010-03-22}
   s.description = %q{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.}
   s.email = %q{tobi@leetsoft.com}
   s.files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tobi/delayed_job/tree/master}
   s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Database-backed asynchronous priority queue system -- Extracted from Shopify}
   s.test_files = [
     "spec/delayed_method_spec.rb",

data/generators/delayed_job/templates/migration.rb

@@ -6,7 +6,7 @@ class CreateDelayedJobs < ActiveRecord::Migration
       t.text     :handler
       t.string   :job_type
       t.string   :name
-      t.string   :last_error
+      t.text     :last_error
       t.datetime :run_at
       t.datetime :locked_at
       t.datetime :failed_at

data/lib/delayed/job.rb

@@ -99,7 +99,11 @@ module Delayed
         # This leads to a more even distribution of jobs across the worker processes.
         find_available( options ).each do |job|
           t = job.run_with_lock( max_run_time, worker_name )
-          return t unless t.nil?  # return if we did work (good or bad)
+          if t.nil?
+            Delayed::Worker.logger.info "* #{worker_name} No work done."
+          else
+            return t
+          end
         end
         # we didn't do any work, all 5 were not lockable
         nil
@@ -120,6 +124,7 @@ module Delayed
             else
               break  # leave if no work could be done
           end
+          Delayed::Worker.logger.info "#{options[:worker_name]} job done..."
           break if Worker.exit # leave if we're exiting
         end
 
@@ -163,11 +168,12 @@ 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)
-      if self.attempts < (payload_object.send(:max_attempts) rescue MAX_ATTEMPTS)
+      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
+        self.run_at       = time unless self.attempts == max_attempts
         self.last_error   = message + "\n" + backtrace.join("\n")
         self.unlock
         save!
@@ -180,10 +186,10 @@ module Delayed
     # Try to run one job.
     # Returns true/false (work done/work failed) or nil if job can't be locked.
     def run_with_lock(max_run_time = MAX_RUN_TIME, worker_name = Worker::DEFAULT_WORKER_NAME)
-      Delayed::Worker.logger.info "* [JOB] aquiring lock on #{name}"
+      Delayed::Worker.logger.info "* [JOB] #{worker_name} aquiring lock on #{name}"
       unless lock_exclusively!(max_run_time, worker_name)
         # We did not get the lock, some other worker process must have
-        Delayed::Worker.logger.warn "* [JOB] failed to aquire exclusive lock for #{name}"
+        Delayed::Worker.logger.warn "* [JOB] #{worker_name} - failed to aquire exclusive lock for #{name}"
         return nil # no work done
       end
 
@@ -193,7 +199,7 @@ module Delayed
         end
         destroy_successful_jobs ? destroy :
           update_attribute(:finished_at, Time.now)
-        Delayed::Worker.logger.info "* [JOB] #{name} completed after %.4f" % runtime
+        Delayed::Worker.logger.info "* [JOB] #{worker_name} -  #{name} completed after %.4f" % runtime
         return true  # did work
       rescue Exception => e
         reschedule e.message, e.backtrace

data/lib/delayed/worker.rb

@@ -27,7 +27,7 @@ module Delayed
     attr_accessor :name
 
     # Constraints for this worker, what kind of jobs is gonna execute?
-    attr_accessor :min_priority, :max_priority, :job_types
+    attr_accessor :min_priority, :max_priority, :job_types, :only_for
 
     attr_accessor :quiet
 
@@ -41,7 +41,7 @@ module Delayed
     #   - max_priority: constraint for selecting what jobs to execute (integer)
     #   - job_types: constraint for selecting what jobs to execute (String or Array)
     def initialize(options={})
-      [ :quiet, :name, :min_priority, :max_priority, :job_types ].each do |attr_name|
+      [ :quiet, :name, :min_priority, :max_priority, :job_types, :only_for ].each do |attr_name|
         send "#{attr_name}=", options[attr_name]
       end
       # Default values
@@ -90,6 +90,7 @@ module Delayed
           :limit        => 5,
           :min_priority => min_priority,
           :max_priority => max_priority,
+          :only_for     => only_for,
           :job_types    => job_types }
       end
   end

metadata

@@ -1,20 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
+- "Jes\xC3\xBAs Garc\xC3\xADa S\xC3\xA1ez"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2010-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 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.
-email: tobi@leetsoft.com
+email: blaxter@gmail.com
 executables: []
 
 extensions: []
@@ -42,9 +48,10 @@ files:
 - spec/story_spec.rb
 - tasks/jobs.rake
 - tasks/tasks.rb
-has_rdoc: false
-homepage: http://github.com/tobi/delayed_job/tree/master
-licenses: 
+has_rdoc: true
+homepage: http://github.com/blaxter/delayed_job
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -57,18 +64,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify