delayed_job_on_steroids 1.7.1 → 1.7.2

data/README.textile

@@ -26,6 +26,7 @@ The created table looks as follows:
     table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
     table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
     table.text     :handler                      # YAML-encoded string of the object that will do work
+    table.string   :job_type                     # Class name of the job object, for type-specific workers
     table.string   :last_error                   # reason for last failure (See Note below)
     table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
     table.datetime :locked_at                    # Set when a client is working on this object
@@ -104,6 +105,13 @@ Keep in mind that each worker will check the database at least every 5 seconds.
 
 Note: The rake task will exit if the database has any network connectivity problems.
 
+If you only want to run specific types of jobs in a given worker, include them when initializing the worker:
+
+<pre><code>
+  Delayed::Worker.new(:job_types => "SimpleJob").start
+  Delayed::Worker.new(:job_types => ["SimpleJob", "NewsletterJob"]).start
+</pre></code>
+
 h3. Cleaning up
 
 You can invoke @rake jobs:clear@ to delete all jobs in the queue.

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

data/delayed_job_on_steroids.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_on_steroids}
-  s.version = "1.7.1"
+  s.version = "1.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias L\303\274tke", "Aleksey Palazhchenko"]

data/lib/delayed/job.rb

@@ -27,9 +27,10 @@ module Delayed
 
     ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
 
-    cattr_accessor :min_priority, :max_priority
+    cattr_accessor :min_priority, :max_priority, :job_types
     self.min_priority = nil
     self.max_priority = nil
+    self.job_types    = nil
 
     # When a worker is exiting, make sure we don't have any locked jobs.
     def self.clear_locks!
@@ -57,7 +58,8 @@ module Delayed
     end
 
     def payload_object=(object)
-      self['handler'] = object.to_yaml
+      self['job_type'] = object.class.to_s
+      self['handler']  = object.to_yaml
     end
 
     # Reschedule the job in the future (when a job fails).
@@ -117,7 +119,6 @@ module Delayed
     end
 
     # Find a few candidate jobs to run (in case some immediately get locked by others).
-    # Return in random order prevent everyone trying to do same head job at once.
     def self.find_available(limit = 5, max_run_time = MAX_RUN_TIME)
 
       time_now = db_time_now
@@ -136,13 +137,16 @@ module Delayed
         conditions << max_priority
       end
 
+      if self.job_types
+        sql << ' AND (job_type IN (?))'
+        conditions << job_types
+      end
+
       conditions.unshift(sql)
 
-      records = ActiveRecord::Base.silence do
+      ActiveRecord::Base.silence do
         find(:all, :conditions => conditions, :order => NextTaskOrder, :limit => limit)
       end
-
-      records.sort_by { rand() }
     end
 
     # Run the next job we can get an exclusive lock on.

data/lib/delayed/worker.rb

@@ -13,6 +13,7 @@ module Delayed
       @quiet = options[:quiet]
       Delayed::Job.min_priority = options[:min_priority] if options.has_key?(:min_priority)
       Delayed::Job.max_priority = options[:max_priority] if options.has_key?(:max_priority)
+      Delayed::Job.job_types    = options[:job_types]    if options.has_key?(:job_types)
     end
 
     def start

data/spec/database.rb

@@ -19,6 +19,7 @@ ActiveRecord::Schema.define do
     table.integer  :priority, :default => 0
     table.integer  :attempts, :default => 0
     table.text     :handler
+    table.string   :job_type
     table.string   :last_error
     table.datetime :run_at
     table.datetime :locked_at

data/spec/job_spec.rb

@@ -69,8 +69,31 @@ describe Delayed::Job do
 
     SimpleJob.runs.should == 1
   end
-                     
-                     
+
+  it "should work on specified job types" do
+    SimpleJob.runs.should == 0
+
+    Delayed::Job.job_types = "SimpleJob"
+    Delayed::Job.enqueue SimpleJob.new
+    Delayed::Job.work_off
+
+    SimpleJob.runs.should == 1
+
+    Delayed::Job.job_types = nil
+  end
+
+  it "should not work on unspecified job types" do
+    SimpleJob.runs.should == 0
+
+    Delayed::Job.job_types = "AnotherJob"
+    Delayed::Job.enqueue SimpleJob.new
+    Delayed::Job.work_off
+
+    SimpleJob.runs.should == 0
+
+    Delayed::Job.job_types = nil
+  end
+
   it "should work with eval jobs" do
     $eval_job_ran = false
 
@@ -269,7 +292,21 @@ describe Delayed::Job do
       Delayed::Job.work_off
 
       SimpleJob.runs.should == 1
-    end                         
+    end
+    
+    it "should fetch jobs ordered by priority" do
+      NUM = 10
+      NUM.times { Delayed::Job.enqueue SimpleJob.new, rand(NUM) }
+      jobs = Delayed::Job.find_available(NUM)
+      ordered = true
+      jobs[0..-2].each_index do |i|
+        if (jobs[i].priority < jobs[i+1].priority)
+          ordered = false
+          break
+        end
+      end
+      ordered.should == true
+    end
    
   end
   

data/tasks/tasks.rb

@@ -8,8 +8,9 @@ namespace :jobs do
     Delayed::Job.delete_all
   end
 
-  desc "Start a delayed_job worker."
+  desc "Start a delayed_job worker. Options: MIN_PRIORITY, MAX_PRIORITY, JOB_TYPES."
   task :work => [:merb_env, :environment] do
-    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY']).start
+    Delayed::Worker.new(:min_priority => ENV['MIN_PRIORITY'], :max_priority => ENV['MAX_PRIORITY'],
+      :job_types => ENV['JOB_TYPES']).start
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"