parallel startup

v1.18.x
Barış Soner Uşaklı 8 years ago
parent bca6151892
commit e0501656b6

@ -180,21 +180,26 @@ function start() {
});
async.waterfall([
async.apply(db.init),
async.apply(db.checkCompatibility),
function (next) {
require('./src/meta').configs.init(next);
},
async.apply(db.init),
function (next) {
if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
require('./src/meta').dependencies.check(next);
} else {
winston.warn('[init] Dependency checking skipped!');
setImmediate(next);
}
},
function (next) {
require('./src/upgrade').check(next);
var meta = require('./src/meta');
async.parallel([
async.apply(db.checkCompatibility),
async.apply(meta.configs.init),
function (next) {
if (nconf.get('dep-check') === undefined || nconf.get('dep-check') !== false) {
meta.dependencies.check(next);
} else {
winston.warn('[init] Dependency checking skipped!');
setImmediate(next);
}
},
function (next) {
require('./src/upgrade').check(next);
}
], function (err) {
next(err);
});
},
function (next) {
var webserver = require('./src/webserver');

@ -167,12 +167,12 @@
module.checkCompatibility = function (callback) {
var mongoPkg = require.main.require('./node_modules/mongodb/package.json');
var err = semver.lt(mongoPkg.version, '2.0.0') ? new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.') : null;
if (err) {
err.stacktrace = false;
if (semver.lt(mongoPkg.version, '2.0.0')) {
return callback(new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.'));
}
callback(err);
callback();
};
module.info = function (db, callback) {

@ -118,11 +118,10 @@
}
if (semver.lt(info.redis_version, '2.8.9')) {
err = new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.');
err.stacktrace = false;
return callback(new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.'));
}
callback(err);
callback();
});
};

Loading…
Cancel
Save