github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mongo write error handling.

Browse Source 
Previously, if we did a Mongo write inside a method and Mongo returned an error
(eg, duplicate key in a unique index), the write fence would never fire and the
client would never quiesce. Now we make sure to fire the write fence (and mark
the collection dirty) even on error.
This commit is contained in:
David Glasser
2012-10-09 22:49:57 -07:00
parent 5fd3c7ce71
commit bbf9ae0c2b
1 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
packages/mongo-livedata/mongo_driver.js
View File

@@ -105,13 +105,6 @@ _Mongo.prototype.insert = function (collection_name, document) {
var write = self._maybeBeginWrite();
var finish = Meteor.bindEnvironment(function () {
Meteor.refresh({collection: collection_name});
write.committed();
}, function (e) {
Meteor._debug("Exception while completing insert: " + e.stack);
});
var future = new Future;
self._withCollection(collection_name, function (err, collection) {
if (err) {
@@ -120,17 +113,13 @@ _Mongo.prototype.insert = function (collection_name, document) {
}
collection.insert(document, {safe: true}, function (err) {
if (err) {
future.ret(err);
return;
}
finish();
future.ret();
future.ret(err);
});
});
var err = future.wait();
Meteor.refresh({collection: collection_name});
write.committed();
if (err)
throw err;
};
@@ -147,13 +136,6 @@ _Mongo.prototype.remove = function (collection_name, selector) {
var write = self._maybeBeginWrite();
var finish = Meteor.bindEnvironment(function () {
Meteor.refresh({collection: collection_name});
write.committed();
}, function (e) {
Meteor._debug("Exception while completing remove: " + e.stack);
});
// XXX does not allow options. matches the client.
selector = _Mongo._rewriteSelector(selector);
@@ -165,17 +147,13 @@ _Mongo.prototype.remove = function (collection_name, selector) {
}
collection.remove(selector, {safe: true}, function (err) {
if (err) {
future.ret(err);
return;
}
finish();
future.ret();
future.ret(err);
});
});
var err = future.wait();
Meteor.refresh({collection: collection_name});
write.committed();
if (err)
throw err;
};
@@ -192,13 +170,6 @@ _Mongo.prototype.update = function (collection_name, selector, mod, options) {
var write = self._maybeBeginWrite();
var finish = Meteor.bindEnvironment(function () {
Meteor.refresh({collection: collection_name});
write.committed();
}, function (e) {
Meteor._debug("Exception while completing update: " + e.stack);
});
selector = _Mongo._rewriteSelector(selector);
if (!options) options = {};
@@ -215,17 +186,13 @@ _Mongo.prototype.update = function (collection_name, selector, mod, options) {
if (options.multi) opts.multi = true;
collection.update(selector, mod, opts, function (err) {
if (err) {
future.ret(err);
return;
}
finish();
future.ret();
future.ret(err);
});
});
var err = future.wait();
Meteor.refresh({collection: collection_name});
write.committed();
if (err)
throw err;
};