move db.init to reset function

v1.18.x
barisusakli 11 years ago
parent c5cae312d7
commit c0145ad301

@ -199,6 +199,14 @@ function upgrade() {
} }
function reset() { function reset() {
loadConfig();
require('./src/database').init(function(err) {
if (err) {
winston.error(err.message);
process.exit();
}
if (nconf.get('themes')) { if (nconf.get('themes')) {
resetThemes(); resetThemes();
} else if (nconf.get('plugins')) { } else if (nconf.get('plugins')) {
@ -219,19 +227,10 @@ function reset() {
} else { } else {
console.log('no match'); console.log('no match');
} }
});
} }
function resetSettings(callback) { function resetSettings(callback) {
loadConfig();
require('./src/database').init(function(err) {
if (err) {
if (typeof callback === 'function') {
return callback(err);
}
process.exit();
return;
}
var meta = require('./src/meta'); var meta = require('./src/meta');
meta.configs.set('allowLocalLogin', 1, function(err) { meta.configs.set('allowLocalLogin', 1, function(err) {
if (typeof callback === 'function') { if (typeof callback === 'function') {
@ -240,16 +239,11 @@ function resetSettings(callback) {
process.exit(); process.exit();
} }
}); });
});
} }
function resetThemes(callback) { function resetThemes(callback) {
loadConfig(); var meta = require('./src/meta');
var db = require('./src/database'),
meta = require('./src/meta');
db.init(function() {
meta.themes.set({ meta.themes.set({
type: 'local', type: 'local',
id: 'nodebb-theme-vanilla' id: 'nodebb-theme-vanilla'
@ -261,15 +255,10 @@ function resetThemes(callback) {
process.exit(); process.exit();
} }
}); });
});
} }
function resetPlugins(callback) { function resetPlugins(callback) {
loadConfig();
var db = require('./src/database'); var db = require('./src/database');
db.init(function() {
db.delete('plugins:active', function(err) { db.delete('plugins:active', function(err) {
winston.info('[reset] All Plugins De-activated'); winston.info('[reset] All Plugins De-activated');
if (typeof callback === 'function') { if (typeof callback === 'function') {
@ -278,15 +267,9 @@ function resetPlugins(callback) {
process.exit(); process.exit();
} }
}); });
});
} }
function resetWidgets(callback) { function resetWidgets(callback) {
loadConfig();
var db = require('./src/database');
db.init(function() {
require('./src/widgets').reset(function(err) { require('./src/widgets').reset(function(err) {
winston.info('[reset] All Widgets moved to Draft Zone'); winston.info('[reset] All Widgets moved to Draft Zone');
if (typeof callback === 'function') { if (typeof callback === 'function') {
@ -295,7 +278,6 @@ function resetWidgets(callback) {
process.exit(); process.exit();
} }
}); });
});
} }
function shutdown(code) { function shutdown(code) {

Loading…
Cancel
Save