delayed_job_mongoid 1.0.0 → 1.0.1

data/README.md

@@ -4,10 +4,10 @@
 
 Add the gems to your Gemfile:
 
-    gem 'delayed_job', '2.1.0.pre2'
-    gem 'delayed_job_mongoid', '1.0.0.rc'
+    gem 'delayed_job'
+    gem 'delayed_job_mongoid'
 
-Create the indexes:
+After running `bundle install`, create the indexes (and don't forget to do this on your production database):
 
     script/rails runner 'Delayed::Backend::Mongoid::Job.create_indexes'
 

data/lib/delayed/backend/mongoid.rb

@@ -14,7 +14,7 @@ module Delayed
         field :failed_at,   :type=> Time
         field :last_error,  :type=> String
 
-        index :locked_by
+        index ([[:locked_by, -1], [:priority, 1], [:run_at, 1]])
 
         before_save :set_default_run_at
 
@@ -30,45 +30,37 @@ module Delayed
           Time.now.utc
         end
 
-        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
+        # Reserves this job for the worker.
+        #
+        # Uses Mongo's findAndModify operation to atomically pick and lock one
+        # job from from the collection. findAndModify is not yet available
+        # directly thru Mongoid so go down to the Mongo Ruby driver instead.
+        def self.reserve(worker, max_run_time = Worker.max_run_time)
           right_now = db_time_now
 
           conditions = {:run_at  => {"$lte" => right_now}, :failed_at => nil}
           (conditions[:priority] ||= {})['$gte'] = Worker.min_priority.to_i if Worker.min_priority
           (conditions[:priority] ||= {})['$lte'] = Worker.max_priority.to_i if Worker.max_priority
 
+          where = "this.locked_by == '#{worker.name}' || this.locked_at == null || this.locked_at < #{make_date(right_now - max_run_time)}"
+          conditions.merge!('$where' => where)
 
-          where = "this.locked_at == null || this.locked_at < #{make_date(right_now - max_run_time)}"
-          results = self.where(conditions.merge(:locked_by => worker_name)).limit(-limit).order_by([['priority', 1], ['run_at', 1]]).to_a
-          results += self.where(conditions.merge('$where' => where)).limit(-limit+results.size).order_by([['priority', 1], ['run_at', 1]]).to_a if results.size < limit
-          results
+          begin
+            result = self.db.collection(self.collection.name).find_and_modify(:query => conditions, :sort => [['locked_by', -1], ['priority', 1], ['run_at', 1]], :update => {"$set" => {:locked_at => right_now, :locked_by => worker.name}})
+            # Return result as a Mongoid document.
+            # When Mongoid starts supporting findAndModify, this extra step should no longer be necessary.
+            self.find(:first, :conditions => {:_id => result["_id"]})
+          rescue Mongo::OperationFailure
+            nil # no jobs available
+          end
         end
+
         # When a worker is exiting, make sure we don't have any locked jobs.
         def self.clear_locks!(worker_name)
           self.collection.update({:locked_by => worker_name}, {"$set" => {:locked_at => nil, :locked_by => nil}}, :multi => true)
         end
 
-        # Lock this job for this worker.
-        # Returns true if we have the lock, false otherwise.
-        def lock_exclusively!(max_run_time, worker = worker_name)
-          right_now = self.class.db_time_now
-          overtime = right_now - max_run_time.to_i
-
-          query = "this.locked_at == null || this.locked_at < #{make_date(overtime)} || this.locked_by == #{worker.to_json}"
-          conditions = {:_id => id, :run_at => {"$lte" => right_now}, "$where" => query}
-
-          self.collection.update(conditions, {"$set" => {:locked_at => right_now, :locked_by => worker}})
-          affected_rows = self.collection.find({:_id => id, :locked_by => worker}).count
-          if affected_rows == 1
-            self.locked_at = right_now
-            self.locked_by = worker
-            return true
-          else
-            return false
-          end
-        end
-
-        private
+      private
 
         def self.make_date(date_or_seconds)
         "new Date(#{date_or_seconds.to_f * 1000})"
@@ -80,4 +72,4 @@ module Delayed
       end
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 -06:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -34,6 +35,7 @@ dependencies:
   name: delayed_job
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -48,6 +50,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -85,6 +88,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -92,6 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -101,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mongoid backend for delayed_job