Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-08 07:40:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable running multiple upgrades at once

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-10-13 10:53:02 -06:00
parent bf1e922cab
commit f9a1951ec5
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app.js
View File

@@ -219,14 +219,13 @@ function upgrade() {
var meta = require('./src/meta');
var upgrade = require('./src/upgrade');
var build = require('./src/meta/build');
var tasks = [db.init, meta.configs.init, upgrade.run, build.buildAll];
var tasks = [db.init, meta.configs.init];
if (nconf.get('upgrade') !== true) {
// Likely an upgrade script name passed in
tasks[2] = async.apply(upgrade.runSingle, nconf.get('upgrade'));
// Skip build
tasks.pop();
tasks.push(async.apply(upgrade.runParticular, nconf.get('upgrade').split(',')));
} else {
tasks.push(upgrade.run, build.buildAll);
}
// disable mongo timeouts during upgrade
nconf.set('mongo:options:socketTimeoutMS', 0);

18
src/upgrade.js
View File

@@ -87,23 +87,19 @@ Upgrade.run = function (callback) {
});
};
Upgrade.runSingle = function (query, callback) {
Upgrade.runParticular = function (names, callback) {
process.stdout.write('\nParsing upgrade scripts... ');
async.waterfall([
async.apply(file.walk, path.join(__dirname, './upgrades')),
function (files, next) {
next(null, files.filter(function (file) {
return path.basename(file, '.js') === query;
}));
},
], function (err, files) {
if (err) {
return callback(err);
}
var upgrades = files.filter(function (file) {
return names.indexOf(path.basename(file, '.js')) !== -1;
});
Upgrade.process(files, 0, callback);
});
Upgrade.process(upgrades, 0, next);
},
], callback);
};
Upgrade.process = function (files, skipCount, callback) {