Fix for typo, also return jobs in random order to yield site to furth…

…er avoid locking issues
tobi · Nov 26, 2008 · d0a9c2d · d0a9c2d
1 parent 916e9f2
commit d0a9c2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/delayed/job.rb b/lib/delayed/job.rb
@@ -104,9 +104,11 @@ def self.find_available(limit = 5, max_run_time = MAX_RUN_TIME)
 
       conditions.unshift(sql)         
 
-      ActiveRecord::Base.silence do
+      records = ActiveRecord::Base.silence do
         find(:all, :conditions => conditions, :order => NextTaskOrder, :limit => limit)
       end
+
+      records.sort { rand() }
     end                                    
 
     # Get the payload of the next job we can get an exclusive lock on.

diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb
@@ -36,7 +36,7 @@ def start
       end           
 
     ensure
-      Delayed::Job..clear_locks!
+      Delayed::Job.clear_locks!
     end
 
     def say(text)