mongodb-queue
Advanced tools
Comparing version 1.0.1 to 2.0.0
@@ -11,3 +11,3 @@ /** | ||
* | ||
**/ | ||
**/ | ||
@@ -26,3 +26,3 @@ var crypto = require('crypto') | ||
function nowPlusSecs(secs) { | ||
return (new Date(Date.now() + secs * 1000)).toISOString() | ||
return (new Date(Date.now() + secs * 1000)).toISOString() | ||
} | ||
@@ -55,10 +55,10 @@ | ||
Queue.prototype.ensureIndexes = function(callback) { | ||
Queue.prototype.createIndexes = function(callback) { | ||
var self = this | ||
self.col.ensureIndex({ deleted : 1, visible : 1, _id : 1 }, function(err) { | ||
self.col.createIndex({ deleted : 1, visible : 1, _id : 1 }, function(err, indexname) { | ||
if (err) return callback(err) | ||
self.col.ensureIndex({ ack : 1 }, { unique : true, sparse : true }, function(err) { | ||
self.col.createIndex({ ack : 1 }, { unique : true, sparse : true }, function(err) { | ||
if (err) return callback(err) | ||
callback() | ||
callback(null, indexname) | ||
}) | ||
@@ -79,5 +79,5 @@ }) | ||
} | ||
self.col.insert(msg, function(err, results) { | ||
self.col.insertOne(msg, function(err, results) { | ||
if (err) return callback(err) | ||
callback(null, '' + results[0]._id) | ||
callback(null, '' + results.ops[0]._id) | ||
}) | ||
@@ -109,4 +109,5 @@ } | ||
self.col.findAndModify(query, sort, update, { new : true }, function(err, msg) { | ||
self.col.findOneAndUpdate(query, update, { sort: sort, returnOriginal : false }, function(err, result) { | ||
if (err) return callback(err) | ||
var msg = result.value | ||
if (!msg) return callback() | ||
@@ -122,3 +123,2 @@ | ||
} | ||
// if we have a deadQueue, then check the tries, else don't | ||
@@ -165,8 +165,8 @@ if ( self.deadQueue ) { | ||
} | ||
self.col.findAndModify(query, undefined, update, { new : true }, function(err, msg, blah) { | ||
self.col.findOneAndUpdate(query, update, { returnOriginal : false }, function(err, msg, blah) { | ||
if (err) return callback(err) | ||
if ( !msg ) { | ||
if ( !msg.value ) { | ||
return callback(new Error("Queue.ping(): Unidentified ack : " + ack)) | ||
} | ||
callback(null, '' + msg._id) | ||
callback(null, '' + msg.value._id) | ||
}) | ||
@@ -188,8 +188,8 @@ } | ||
} | ||
self.col.findAndModify(query, undefined, update, { new : true }, function(err, msg, blah) { | ||
self.col.findOneAndUpdate(query, update, { returnOriginal : false }, function(err, msg, blah) { | ||
if (err) return callback(err) | ||
if ( !msg ) { | ||
if ( !msg.value ) { | ||
return callback(new Error("Queue.ack(): Unidentified ack : " + ack)) | ||
} | ||
callback(null, '' + msg._id) | ||
callback(null, '' + msg.value._id) | ||
}) | ||
@@ -205,3 +205,3 @@ } | ||
self.col.remove(query, callback) | ||
self.col.deleteMany(query, callback) | ||
} | ||
@@ -208,0 +208,0 @@ |
{ | ||
"name": "mongodb-queue", | ||
"version": "1.0.1", | ||
"version": "2.0.0", | ||
"description": "Message queues which uses MongoDB.", | ||
@@ -11,5 +11,5 @@ "main": "mongodb-queue.js", | ||
"devDependencies": { | ||
"tape": "^2.14.0", | ||
"mongodb": "^1.4.9", | ||
"async": "^0.9.0" | ||
"tape": "^4.2.2", | ||
"mongodb": "^2.0.48", | ||
"async": "^1.5.0" | ||
}, | ||
@@ -16,0 +16,0 @@ "homepage": "https://github.com/chilts/mongodb-queue", |
@@ -77,3 +77,3 @@ # mongodb-queue # | ||
```js | ||
queue.ensureIndexes(function(err) { | ||
queue.createIndexes(function(err, indexName) { | ||
// The indexes needed have been added to MongoDB. | ||
@@ -80,0 +80,0 @@ }) |
@@ -10,9 +10,9 @@ var async = require('async') | ||
test('visibility: check message is back in queue after 3s', function(t) { | ||
t.plan(1) | ||
t.plan(2) | ||
var queue = mongoDbQueue(db, 'visibility', { visibility : 3 }) | ||
queue.ensureIndexes(function(err) { | ||
queue.createIndexes(function(err, indexName) { | ||
t.ok(!err, 'There was no error when running .ensureIndexes()') | ||
t.ok(indexName, 'receive indexName we created') | ||
t.end() | ||
@@ -19,0 +19,0 @@ }) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
69037
1394