blaxter-delayed_job 2.1.0 → 2.1.1

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/delayed/job.rb

@@ -24,7 +24,7 @@ module Delayed
     cattr_accessor :destroy_successful_jobs
     self.destroy_successful_jobs = false
 
-    NextTaskSQL         = '(run_at <= ? AND (locked_at IS NULL OR locked_at < ?)) AND failed_at IS NULL AND finished_at IS NULL'
+    NextTaskSQL         = '(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR (locked_by = ?)) AND failed_at IS NULL AND finished_at IS NULL'
     NextTaskOrder       = 'priority DESC, run_at ASC'
 
     ParseObjectFromYaml = /\!ruby\/\w+\:([^\s]+)/
@@ -75,7 +75,7 @@ module Delayed
 
         sql        = NextTaskSQL.dup
         time_now   = db_time_now
-        conditions = [time_now, time_now - max_run_time]
+        conditions = [time_now, time_now - max_run_time, worker_name]
         if options[:min_priority]
           sql << ' AND (priority >= ?)'
           conditions << options[:min_priority]
@@ -246,13 +246,7 @@ module Delayed
         # 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
-        self.locked_at    = now
-        self.locked_by    = worker
-        return true
-      else
-        return false
-      end
+      affected_rows == 1 && reload
     end
 
     # Unlock this job (note: not saved to DB)

data/lib/delayed/job_handler.rb

@@ -90,11 +90,16 @@ module Delayed
 
     # Whether we can or not execute this job
     def can_execute(job)
+      return false if is_already_in_execution(job)
       object = get_object(job)
       object && ! is_there_job_in_execution_for(object) &&
         jobs_in_execution < @max_active_jobs
     end
 
+    def is_already_in_execution(job)
+      !! @jobs.values.detect {|h| h[:job].id == job.id }
+    end
+
     def each_job_in_execution
       @jobs.each_pair do |key, value|
         yield value[:job], value[:started_at], value[:thread]

data/spec/job_spec.rb

@@ -428,10 +428,10 @@ describe Delayed::Job do
       SimpleJob.runs.should == 1 # runs the one open job
     end
 
-    it "should find only ur own jobs unless they are locked" do
+    it "should find our own jobs regardless of locks" do
       SimpleJob.runs.should == 0
       Delayed::Job.work_off :worker_name => 'worker1'
-      SimpleJob.runs.should == 1 # runs open job, no worker1 jobs that were already locked
+      SimpleJob.runs.should == 3 # runs open job plus worker1 jobs that were already locked
     end
   end
 
@@ -453,7 +453,9 @@ describe Delayed::Job do
     it "should ignore locks when finding our own jobs" do
       SimpleJob.runs.should == 0
       Delayed::Job.work_off :worker_name => 'worker1'
-      SimpleJob.runs.should == 2 # runs open job plus worker1 jobs (unless locked)
+      SimpleJob.runs.should == 3 # runs open job plus worker1 jobs
+      # This is useful in the case of a crash/restart on worker1,
+      # but make sure multiple workers on the same host have unique names!
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"