Resetting 'all' done in series now -- #1317

v1.18.x
Julian Lam 11 years ago
parent 67f9c8670a
commit ba16f95d1f

@ -84,15 +84,7 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf
} else if (nconf.get('widgets')) {
resetWidgets();
} else if (nconf.get('all')) {
resetWidgets(function(err) {
if (err) {
winston.error('[reset] Errors were encountered while resetting widget areas: ' + err.message);
process.exit();
} else {
winston.info('[reset] All Widgets moved to Draft Zone');
}
require('async').parallel([resetThemes, resetPlugins], function(err) {
require('async').series([resetWidgets, resetThemes, resetPlugins], function(err) {
if (!err) {
winston.info('[reset] Reset complete.');
} else {
@ -100,7 +92,6 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf
}
process.exit();
});
});
} else {
console.log('no match');
}
@ -268,7 +259,14 @@ function resetWidgets(callback) {
var db = require('./src/database');
db.init(function() {
require('./src/widgets').reset(callback);
require('./src/widgets').reset(function(err) {
winston.info('[reset] All Widgets moved to Draft Zone');
if (typeof callback === 'function') {
callback(err);
} else {
process.exit();
}
});
});
}

Loading…
Cancel
Save