Merge pull request agenda#180 from chrisckchang/master

Change query structure for find and lock jobs $or query + add indexes

Author: rschmukler

lib/agenda.js

@@ -43,10 +43,8 @@ Agenda.prototype.database = function(url, collection, options) {
   this._db = mongo.db(url, options).collection(collection);
 
   var ignoreErrors = function() {};
-  this._db.ensureIndex("nextRunAt", ignoreErrors)
-          .ensureIndex("lockedAt", ignoreErrors)
-          .ensureIndex("name", ignoreErrors)
-          .ensureIndex("priority", ignoreErrors);
+  this._db.ensureIndex({"name" : 1, "priority" : -1, "lockedAt" : 1, "nextRunAt" : 1, "disabled" : 1}, ignoreErrors)
+          .ensureIndex({ "name" : 1, "lockedAt" : 1, "priority" : -1, "nextRunAt" : 1, "disabled" : 1 } , ignoreErrors);
 
   return this;
 };
@@ -259,14 +257,11 @@ Agenda.prototype._findAndLockNextJob = function(jobName, definition, cb) {
 
   this._db.findAndModify(
     {
-      nextRunAt: {$lte: this._nextScanAt},
-      disabled: { $ne: true },
       $or: [
-        {lockedAt: null},
-        {lockedAt: {$exists: false}},
-        {lockedAt: {$lte: lockDeadline}}
-      ],
-      name: jobName
+        {name: jobName, lockedAt: null, nextRunAt: {$lte: this._nextScanAt}, disabled: { $ne: true }},
+        {name: jobName, lockedAt: {$exists: false}, nextRunAt: {$lte: this._nextScanAt}, disabled: { $ne: true }},
+        {name: jobName, lockedAt: {$lte: lockDeadline}, nextRunAt: {$lte: this._nextScanAt}, disabled: { $ne: true }}
+      ]
     },
     {'priority': -1},
     {$set: {lockedAt: now}},