From a6b70bd963ca9454b6e2ffc59fdc4a06a5da8369 Mon Sep 17 00:00:00 2001 From: Gregory Waxman Date: Thu, 10 Nov 2016 17:55:15 -0500 Subject: [PATCH] Fixed bluebird --- perf/doxbee-sequential-errors/promises-bluebird.js | 2 +- perf/madeup-parallel/promises-bluebird.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perf/doxbee-sequential-errors/promises-bluebird.js b/perf/doxbee-sequential-errors/promises-bluebird.js index 8c8499b..c6408b0 100644 --- a/perf/doxbee-sequential-errors/promises-bluebird.js +++ b/perf/doxbee-sequential-errors/promises-bluebird.js @@ -10,7 +10,7 @@ module.exports = function upload(stream, idOrPath, tag, done) { var fileP = self.byUuidOrPath(idOrPath).get(); var version, fileId, file; - bluebird.all([blobIdP, fileP]).spread(function(blobId, fileV) { + bluebird.join(blobIdP, fileP, function(blobId, fileV) { file = fileV; var previousId = file ? file.version : null; version = { diff --git a/perf/madeup-parallel/promises-bluebird.js b/perf/madeup-parallel/promises-bluebird.js index 9f8286e..5cabb77 100644 --- a/perf/madeup-parallel/promises-bluebird.js +++ b/perf/madeup-parallel/promises-bluebird.js @@ -11,7 +11,7 @@ module.exports = function upload(stream, idOrPath, tag, done) { queries[i] = FileVersion.insert({index: i}).execWithin(tx); } - Promise.all(queries).then().then(function() { + Promise.all(queries).then(function() { tx.commit(); done(); }, function(err) {