install db dependencies in upgrade script

This commit is contained in:
barisusakli
2014-07-23 13:30:12 -04:00
parent d565de60d0
commit 5c57ed5ea0
2 changed files with 33 additions and 9 deletions

View File

@@ -206,6 +206,16 @@ function completeConfigSetup(err, config, next) {
}
function setupDatabase(server_conf, next) {
install.installDbDependencies(server_conf, function(err) {
if (err) {
return next(err);
}
require('./database').init(next);
});
}
install.installDbDependencies = function(server_conf, next) {
var npm = require('npm'),
packages = [];
@@ -221,15 +231,9 @@ function setupDatabase(server_conf, next) {
packages = packages.concat(DATABASES[server_conf.secondary_database].dependencies);
}
npm.commands.install(packages, function(err) {
if (err) {
return next(err);
}
require('./database').init(next);
});
npm.commands.install(packages, next);
});
}
};
function setupDefaultConfigs(next) {
winston.info('Populating database with default configs, if not already set...');