blaxter-delayed_job 2.1.4 → 2.1.5

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/lib/delayed/job.rb

@@ -95,15 +95,22 @@ module Delayed
           sql << ' AND name LIKE ?'
           conditions << "%#{options[:only_for]}%"
         end
+
+        if options[:unless]
+          sql << " AND (#{primary_key} NOT IN (?))"
+          conditions << options[:unless]
+        end
+
         conditions.unshift(sql)
       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 find_available(options = {})
-        limit = options[:limit] || 5
+        find_opt = {:conditions => conditions_available(options), :order => NextTaskOrder}
+        find_opt[:limit] = options[:limit] if options[:limit]
         ActiveRecord::Base.silence do
-          find :all, :conditions => conditions_available(options), :order => NextTaskOrder, :limit => limit
+          find :all, find_opt
         end
       end
 

data/lib/delayed/job_launcher.rb

@@ -87,6 +87,12 @@ module Delayed
       @jobs.size
     end
 
+    def jobs_ids_in_execution
+      ret = []
+      each_job_in_execution {|job| ret << job.id }
+      ret
+    end
+
     def kill_threads!
       each_job_in_execution do |job, started_at, thread|
         puts "Killing #{job.name}"

data/lib/delayed/worker.rb

@@ -79,7 +79,7 @@ module Delayed
     end
 
     def jobs_to_execute
-      Job.find_available constraints
+      Job.find_available constraints.merge(:unless => jobs_ids_in_execution)
     end
 
     def say(text)
@@ -138,7 +138,6 @@ module Delayed
     def constraints
       {:max_run_time => Job::MAX_RUN_TIME,
        :worker_name  => name,
-       :limit        => 5,
        :min_priority => min_priority,
        :max_priority => max_priority,
        :only_for     => only_for,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blaxter-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 1
-  - 4
-  version: 2.1.4
+  - 5
+  version: 2.1.5
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: []