Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

Do not continue to load module if data file syntax error occurs [#466]

Browse Source
This commit is contained in:
reality 2013-05-26 15:21:13 +00:00
parent 3148b3e434
commit bc7bac1218
1 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
run.js
View File

@ -186,7 +186,7 @@ DBot.prototype.reloadModules = function() {
defaultConfig = JSON.parse(defaultConfig); defaultConfig = JSON.parse(defaultConfig);
} catch(err) { // syntax error } catch(err) { // syntax error
this.status[name] = 'Error parsing config: ' + err + ' ' + err.stack.split('\n')[2].trim(); this.status[name] = 'Error parsing config: ' + err + ' ' + err.stack.split('\n')[2].trim();
return; continue;
} }
config = _.defaults(config, defaultConfig); config = _.defaults(config, defaultConfig);
} catch(err) { } catch(err) {
@ -220,87 +220,89 @@ DBot.prototype.reloadModules = function() {
process.nextTick(function() { process.nextTick(function() {
_.each(moduleNames, function(name) { _.each(moduleNames, function(name) {
try { if(this.status[name] === true) {
var moduleDir = './modules/' + name + '/';
var rawModule = require(moduleDir + name);
var module = rawModule.fetch(this);
this.rawModules.push(rawModule);
} catch(err) {
var stack = err.stack.split('\n')[2].trim();
this.status[name] = 'Error loading module: ' + err + ' ' + stack;
console.log('Error loading module: ' + err + ' ' + stack);
return;
}
module.name = name;
module.db = this.ddb.databanks[name];
module.config = this.config[name];
// Load the module data
_.each([ 'commands', 'pages', 'api' ], function(property) {
var propertyObj = {};
if(fs.existsSync(moduleDir + property + '.js')) {
try {
var propertyKey = require.resolve(moduleDir + property);
if(propertyKey) delete require.cache[propertyKey];
propertyObj = require(moduleDir + property).fetch(this);
} catch(err) {
this.status[name] = 'Error loading ' + propertyKey +
': ' + err + ' - ' + err.stack.split('\n')[1].trim();
console.log('Module error (' + module.name + ') in ' +
property + ': ' + err);
}
}
if(!_.has(module, property)) module[property] = {};
_.extend(module[property], propertyObj);
_.each(module[property], function(item, itemName) {
item.module = name;
if(_.has(module.config, property) && _.has(module.config[property], itemName)) {
_.extend(item, module.config[property][itemName]);
}
module[property][itemName] = _.bind(item, module);
_.extend(module[property][itemName], item);
}, this);
if(property == 'api') {
this[property][name] = module[property];
} else {
_.extend(this[property], module[property]);
}
}, this);
// Load the module listener
if(module.listener) {
if(!_.isArray(module.on)) {
module.on = [ module.on ];
}
_.each(module.on, function(on) {
this.instance.addListener(on, module.name, module.listener);
}, this);
}
// Load string data for the module
_.each([ 'usage', 'strings' ], function(property) {
var propertyData = {};
try { try {
propertyData = JSON.parse(fs.readFileSync(moduleDir + property + '.json', 'utf-8')); var moduleDir = './modules/' + name + '/';
} catch(err) {}; var rawModule = require(moduleDir + name);
_.extend(this[property], propertyData); var module = rawModule.fetch(this);
if(property == 'strings') { this.rawModules.push(rawModule);
_.each(_.keys(propertyData), function(string) { } catch(err) {
this.stringMap[string] = name; var stack = err.stack.split('\n')[2].trim();
}.bind(this)); this.status[name] = 'Error loading module: ' + err + ' ' + stack;
console.log('Error loading module: ' + err + ' ' + stack);
return;
} }
}, this);
// Provide toString for module name module.name = name;
module.toString = function() { module.db = this.ddb.databanks[name];
return this.name; module.config = this.config[name];
// Load the module data
_.each([ 'commands', 'pages', 'api' ], function(property) {
var propertyObj = {};
if(fs.existsSync(moduleDir + property + '.js')) {
try {
var propertyKey = require.resolve(moduleDir + property);
if(propertyKey) delete require.cache[propertyKey];
propertyObj = require(moduleDir + property).fetch(this);
} catch(err) {
this.status[name] = 'Error loading ' + propertyKey +
': ' + err + ' - ' + err.stack.split('\n')[1].trim();
console.log('Module error (' + module.name + ') in ' +
property + ': ' + err);
}
}
if(!_.has(module, property)) module[property] = {};
_.extend(module[property], propertyObj);
_.each(module[property], function(item, itemName) {
item.module = name;
if(_.has(module.config, property) && _.has(module.config[property], itemName)) {
_.extend(item, module.config[property][itemName]);
}
module[property][itemName] = _.bind(item, module);
_.extend(module[property][itemName], item);
}, this);
if(property == 'api') {
this[property][name] = module[property];
} else {
_.extend(this[property], module[property]);
}
}, this);
// Load the module listener
if(module.listener) {
if(!_.isArray(module.on)) {
module.on = [ module.on ];
}
_.each(module.on, function(on) {
this.instance.addListener(on, module.name, module.listener);
}, this);
}
// Load string data for the module
_.each([ 'usage', 'strings' ], function(property) {
var propertyData = {};
try {
propertyData = JSON.parse(fs.readFileSync(moduleDir + property + '.json', 'utf-8'));
} catch(err) {};
_.extend(this[property], propertyData);
if(property == 'strings') {
_.each(_.keys(propertyData), function(string) {
this.stringMap[string] = name;
}.bind(this));
}
}, this);
// Provide toString for module name
module.toString = function() {
return this.name;
}
this.modules[module.name] = module;
} }
this.modules[module.name] = module;
}.bind(this)); }.bind(this));
}.bind(this)); }.bind(this));