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

domain err catch

Browse Source
This commit is contained in:
reality 2015-01-19 22:59:26 +00:00
parent b3d7abbc3b
commit a101cfe437
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/command/command.js
View File

@ -4,7 +4,8 @@
* command and then runs that command, given the user isn't banned from or * command and then runs that command, given the user isn't banned from or
* ignoring that command. * ignoring that command.
*/ */
var _ = require('underscore')._; var _ = require('underscore')._,
cDomain = require('domain').create();
var command = function(dbot) { var command = function(dbot) {
/** /**
@ -72,18 +73,20 @@ var command = function(dbot) {
} else if(!isIgnoring && _.has(dbot.commands, commandName) && !dbot.commands[commandName].disabled) { } else if(!isIgnoring && _.has(dbot.commands, commandName) && !dbot.commands[commandName].disabled) {
if(this.api.applyRegex(commandName, event)) { if(this.api.applyRegex(commandName, event)) {
try { try {
var command = dbot.commands[commandName], cDomain.run(function() {
results; var command = dbot.commands[commandName],
if(_.has(command, 'resolver')) { results;
event.res = []; if(_.has(command, 'resolver')) {
command.resolver(event, function(err) { event.res = [];
if(!err) { command.resolver(event, function(err) {
results = command.apply(dbot.modules[command.module], [event]); if(!err) {
} results = command.apply(dbot.modules[command.module], [event]);
}); }
} else { });
results = command.apply(dbot.modules[command.module], [event]); } else {
} results = command.apply(dbot.modules[command.module], [event]);
}
});
} catch(err) { } catch(err) {
if(dbot.config.debugMode == true) { if(dbot.config.debugMode == true) {
var stack = err.stack.split('\n').slice(1, dbot.config.debugLevel + 1); var stack = err.stack.split('\n').slice(1, dbot.config.debugLevel + 1);
@ -119,6 +122,15 @@ var command = function(dbot) {
// Not sure this is the right place for this. Perhaps they should be in // Not sure this is the right place for this. Perhaps they should be in
// another file? // another file?
cDomain.on('error', function(err) {
console.log(err); // Hmm
if(_.has(dbot.modules, 'log')) {
// can't really get context
var server = _.keys(dbot.config.servers)[0];
dbot.api.log.log(server, dbot.config.name, '[\u00034ERR\u000f] ' + err.message);
}
});
dbot.access = { dbot.access = {
'admin': function(event) { 'admin': function(event) {
return dbot.config.admins; return dbot.config.admins;