topprospect-delayed_job 2.0.7 → 2.0.8

data/lib/delayed/backend/active_record.rb

@@ -36,11 +36,10 @@ module Delayed
           named_scope :ready_to_run, lambda {|worker_name, max_run_time|
 
             if Worker.queue == Delayed::ALL_QUEUES
-              conditions = ['(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL',
-                            db_time_now, db_time_now - max_run_time, worker_name]
+              conditions = ['(locked_at IS NULL OR locked_at < ?) AND failed_at IS NULL', db_time_now - max_run_time]
             else
-              conditions = ['queue = ? AND (run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL',
-                            Worker.queue, db_time_now, db_time_now - max_run_time, worker_name]
+              conditions = ['queue = ? AND (locked_at IS NULL OR locked_at < ?) AND failed_at IS NULL',
+                            Worker.queue, db_time_now - max_run_time]
             end
 
             {:conditions => conditions}

data/spec/backend/shared_backend_spec.rb

@@ -84,12 +84,12 @@ shared_examples_for 'a backend' do
       @job = create_job :attempts => 50, :failed_at => @backend.db_time_now
       @backend.find_available('worker', 5, 1.second).should_not include(@job)
     end
-    
-    it "should not find jobs scheduled for the future" do
-      @job = create_job :run_at => (@backend.db_time_now + 1.minute)
-      @backend.find_available('worker', 5, 4.hours).should_not include(@job)
-    end
-    
+
+    #it "should not find jobs scheduled for the future" do
+    #  @job = create_job :run_at => (@backend.db_time_now + 1.minute)
+    #  @backend.find_available('worker', 5, 4.hours).should_not include(@job)
+    #end
+
     it "should not find jobs locked by another worker" do
       @job = create_job(:locked_by => 'other_worker', :locked_at => @backend.db_time_now - 1.minute)
       @backend.find_available('worker', 5, 4.hours).should_not include(@job)
@@ -105,10 +105,10 @@ shared_examples_for 'a backend' do
       @backend.find_available('worker', 5, 1.minute).should include(@job)
     end
     
-    it "should find own jobs" do
-      @job = create_job(:locked_by => 'worker', :locked_at => (@backend.db_time_now - 1.minutes))
-      @backend.find_available('worker', 5, 4.hours).should include(@job)
-    end
+    #it "should find own jobs" do
+    #  @job = create_job(:locked_by => 'worker', :locked_at => (@backend.db_time_now - 1.minutes))
+    #  @backend.find_available('worker', 5, 4.hours).should include(@job)
+    #end
 
     it "should find only the right amount of jobs" do
       10.times { create_job }

data/spec/worker_spec.rb

@@ -91,10 +91,10 @@ describe Delayed::Worker do
           lambda { @worker.work_off }.should change { SimpleJob.runs }.from(0).to(1)
         end
     
-        it "should run own jobs" do
-          job_create(:locked_by => @worker.name, :locked_at => (Delayed::Job.db_time_now - 1.minutes))
-          lambda { @worker.work_off }.should change { SimpleJob.runs }.from(0).to(1)
-        end
+        #it "should run own jobs" do
+        #  job_create(:locked_by => @worker.name, :locked_at => (Delayed::Job.db_time_now - 1.minutes))
+        #  lambda { @worker.work_off }.should change { SimpleJob.runs }.from(0).to(1)
+        #end
       end
   
       describe "failed jobs" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: topprospect-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Chris Gaffney
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -07:00
+date: 2011-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency