delayed_job 2.1.2 → 2.1.3

data/README.textile

@@ -206,6 +206,8 @@ Delayed::Worker.destroy_failed_jobs = false. The failed jobs will be marked with
 
 By default all jobs are scheduled with priority = 0, which is top priority. You can change this by setting Delayed::Worker.default_priority to something else. Lower numbers have higher priority.
 
+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:
 
 <pre>
@@ -214,6 +216,7 @@ Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.sleep_delay = 60
 Delayed::Worker.max_attempts = 3
 Delayed::Worker.max_run_time = 5.minutes
+Delayed::Worker.delay_jobs = !Rails.env.test?
 </pre>
 
 h3. Cleaning up

data/lib/delayed/backend/active_record.rb

@@ -16,10 +16,6 @@ module Delayed
         }
         scope :by_priority, order('priority ASC, run_at ASC')
 
-        scope :locked_by_worker, lambda{|worker_name, max_run_time|
-          where(['locked_by = ? AND locked_at > ?', worker_name, db_time_now - max_run_time])
-        }
-
         def self.before_fork
           ::ActiveRecord::Base.clear_all_connections!
         end
@@ -33,25 +29,37 @@ module Delayed
           update_all("locked_by = null, locked_at = null", ["locked_by = ?", worker_name])
         end
 
-        def self.jobs_available_to_worker(worker_name, max_run_time)
+        # Find a few candidate jobs to run (in case some immediately get locked by others).
+        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
           scope = self.ready_to_run(worker_name, max_run_time)
           scope = scope.scoped(:conditions => ['priority >= ?', Worker.min_priority]) if Worker.min_priority
           scope = scope.scoped(:conditions => ['priority <= ?', Worker.max_priority]) if Worker.max_priority
-          scope.by_priority
-        end
 
-        # Reserve a single job in a single update query.  This causes workers to serialize on the
-        # database and avoids contention.
-        def self.reserve(worker, max_run_time = Worker.max_run_time)
-          affected_rows = 0
           ::ActiveRecord::Base.silence do
-            affected_rows = jobs_available_to_worker(worker.name, max_run_time).limit(1).update_all(["locked_at = ?, locked_by = ?", db_time_now, worker.name])
+            scope.by_priority.all(:limit => limit)
           end
+        end
 
+        # Lock this job for this worker.
+        # Returns true if we have the lock, false otherwise.
+        def lock_exclusively!(max_run_time, worker)
+          now = self.class.db_time_now
+          affected_rows = if locked_by != worker
+            # We don't own this job so we will update the locked_by name and the locked_at
+            self.class.update_all(["locked_at = ?, locked_by = ?", now, worker], ["id = ? and (locked_at is null or locked_at < ?) and (run_at <= ?)", id, (now - max_run_time.to_i), now])
+          else
+            # We already own this job, this may happen if the job queue crashes.
+            # Simply resume and update the locked_at
+            self.class.update_all(["locked_at = ?", now], ["id = ? and locked_by = ?", id, worker])
+          end
           if affected_rows == 1
-            locked_by_worker(worker.name, max_run_time).first
+            self.locked_at = now
+            self.locked_by = worker
+            self.locked_at_will_change!
+            self.locked_by_will_change!
+            return true
           else
-            nil
+            return false
           end
         end
 

data/lib/delayed/backend/base.rb

@@ -23,9 +23,13 @@ module Delayed
           unless options[:payload_object].respond_to?(:perform)
             raise ArgumentError, 'Cannot enqueue items which do not respond to perform'
           end
-
-          self.create(options).tap do |job|
-            job.hook(:enqueue)
+          
+          if Delayed::Worker.delay_jobs
+            self.create(options).tap do |job|
+              job.hook(:enqueue)
+            end
+          else
+            options[:payload_object].perform
           end
         end
 

data/lib/delayed/backend/shared_spec.rb

@@ -11,6 +11,7 @@ shared_examples_for 'a delayed_job backend' do
     Delayed::Worker.max_priority = nil
     Delayed::Worker.min_priority = nil
     Delayed::Worker.default_priority = 99
+    Delayed::Worker.delay_jobs = true
     SimpleJob.runs = 0
     described_class.delete_all
   end
@@ -57,6 +58,12 @@ shared_examples_for 'a delayed_job backend' do
         described_class.enqueue SimpleJob.new
         described_class.count.should == 1
       end
+      
+      it "should not increase count after enqueuing items when delay_jobs is false" do
+        Delayed::Worker.delay_jobs = false
+        described_class.enqueue SimpleJob.new
+        described_class.count.should == 0
+      end
 
       it "should be able to set priority [DEPRECATED]" do
         silence_warnings do
@@ -155,6 +162,17 @@ shared_examples_for 'a delayed_job backend' do
       described_class.reserve(worker).should be_nil
     end
 
+    it "should reserve jobs scheduled for the past" do
+      job = create_job :run_at => described_class.db_time_now - 1.minute
+      described_class.reserve(worker).should == job
+    end
+
+    it "should reserve jobs scheduled for the past when time zones are involved" do
+      Time.zone = 'US/Eastern'
+      job = create_job :run_at => described_class.db_time_now - 1.minute.ago.in_time_zone
+      described_class.reserve(worker).should == job
+    end
+
     it "should not reserve jobs locked by other workers" do
       job = create_job
       other_worker = Delayed::Worker.new

data/lib/delayed/recipes.rb

@@ -10,7 +10,7 @@
 # If you want to use command line options, for example to start multiple workers,
 # define a Capistrano variable delayed_job_args:
 #
-#   set :delayed_jobs_args, "-n 2"
+#   set :delayed_job_args, "-n 2"
 #
 # If you've got delayed_job workers running on a servers, you can also specify
 # which servers have delayed_job running and should be restarted after deploy.

data/lib/delayed/worker.rb

@@ -6,11 +6,12 @@ require 'logger'
 
 module Delayed
   class Worker
-    cattr_accessor :min_priority, :max_priority, :max_attempts, :max_run_time, :default_priority, :sleep_delay, :logger
+    cattr_accessor :min_priority, :max_priority, :max_attempts, :max_run_time, :default_priority, :sleep_delay, :logger, :delay_jobs
     self.sleep_delay = 5
     self.max_attempts = 25
     self.max_run_time = 4.hours
     self.default_priority = 0
+    self.delay_jobs = true
 
     # By default failed jobs are destroyed after too many attempts. If you want to keep them around
     # (perhaps to inspect the reason for the failure), set this to false.

data/lib/generators/delayed_job/templates/migration.rb

@@ -13,7 +13,6 @@ class CreateDelayedJobs < ActiveRecord::Migration
     end
 	
     add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
-    add_index :delayed_jobs, :locked_by, :name => 'delayed_jobs_locked_by'
   end
   
   def self.down

data/spec/message_sending_spec.rb

@@ -85,5 +85,32 @@ describe Delayed::MessageSending do
       job.run_at.should == run_at
       job.priority.should == 20
     end
+    
+    class FairyTail
+      attr_accessor :happy_ending
+      def tell
+        @happy_ending = true
+      end
+    end
+    
+    it "should not delay the job when delay_jobs is false" do
+      Delayed::Worker.delay_jobs = false
+      fairy_tail = FairyTail.new
+      lambda {
+        lambda {
+          fairy_tail.delay.tell
+        }.should change(fairy_tail, :happy_ending).from(nil).to(true)
+      }.should_not change { Delayed::Job.count }
+    end
+    
+    it "should delay the job when delay_jobs is true" do
+      Delayed::Worker.delay_jobs = true
+      fairy_tail = FairyTail.new
+      lambda {
+        lambda {
+          fairy_tail.delay.tell
+        }.should_not change(fairy_tail, :happy_ending)
+      }.should change { Delayed::Job.count }.by(1)
+    end
   end
 end

metadata

@@ -1,130 +1,125 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 2
   - 1
-  - 2
-  version: 2.1.2
+  - 3
+  version: 2.1.3
 platform: ruby
 authors: 
+- Chris Gaffney
 - Brandon Keepers
 - "Tobias L\xC3\xBCtke"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: sqlite3
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mysql
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 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: brandon@collectiveidea.com
+email: 
+- chris@collectiveidea.com
+- brandon@opensoul.org
 executables: []
 
 extensions: []
@@ -183,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1896469102761102405
       segments: 
       - 0
       version: "0"
@@ -192,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1896469102761102405
       segments: 
       - 0
       version: "0"