talentbox-delayed_job_sequel 4.0.0.beta1 → 4.0.0.beta1.1

data/lib/delayed/backend/sequel.rb

@@ -37,16 +37,24 @@ module Delayed
           filter(:locked_by => worker_name).update(:locked_by => nil, :locked_at => nil)
         end
 
-        # 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)
-          set = ready_to_run(worker_name, max_run_time)
+        def self.reserve(worker, max_run_time = Worker.max_run_time)
+          set = ready_to_run(worker.name, max_run_time)
           set = set.filter("priority >= ?", Worker.min_priority) if Worker.min_priority
           set = set.filter("priority <= ?", Worker.max_priority) if Worker.max_priority
           set = set.filter(:queue => Worker.queues) if Worker.queues.any?
 
-          silence_log do
-            set.by_priority.limit(limit).all
+          job = set.by_priority.first
+
+          now = self.db_time_now
+
+          return unless job
+          model.db.transaction do
+            job.lock!
+            job.locked_at = now
+            job.locked_by = worker.name
+            job.save(:raise_on_failure => true)
           end
+          job
         end
 
         # Lock this job for this worker.
@@ -134,7 +142,7 @@ module Delayed
           end
         end
 
-        # The default behaviour for sequel on #==/#eql? is to check if all 
+        # The default behaviour for sequel on #==/#eql? is to check if all
         # values are matching.
         # This differs from ActiveRecord which checks class and id only.
         # To pass the specs we're reverting to what AR does here.

data/spec/spec_helper.rb

@@ -53,7 +53,7 @@ end
 require "delayed_job_sequel"
 require "delayed/backend/shared_spec"
 
-Delayed::Worker.logger = Logger.new("/tmp/dj.log")
+Delayed::Worker.logger = Logger.new(ENV["DEBUG"] ? $stdout : "/tmp/dj.log")
 DB.logger = Delayed::Worker.logger
 
 # Purely useful for test cases...

metadata

@@ -2,7 +2,7 @@
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 4.0.0.beta1
+  version: 4.0.0.beta1.1
 platform: ruby
 authors:
 - Jonathan Tron
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -1333829786726044659
+      hash: 3436972036027455601
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement