mirror of
https://github.com/reality/dbot.git
synced 2024-12-28 05:32:50 +01:00
Merge pull request #316 from JohnMaguire2013/reloading
fixing some bugs related to loading
This commit is contained in:
commit
e811c47a63
@ -173,8 +173,10 @@ var commands = function(dbot) {
|
||||
var moduleName = event.params[1];
|
||||
if(_.include(moduleNames, moduleName)) {
|
||||
var moduleDir = '../' + moduleName + '/';
|
||||
var cacheKey = require.resolve(moduleDir + moduleName);
|
||||
delete require.cache[cacheKey];
|
||||
try {
|
||||
var cacheKey = require.resolve(moduleDir + moduleName);
|
||||
delete require.cache[cacheKey];
|
||||
} catch(err) { }
|
||||
dbot.config.moduleNames = _.without(dbot.config.moduleNames, moduleName);
|
||||
dbot.reloadModules();
|
||||
|
||||
|
13
run.js
13
run.js
@ -155,9 +155,16 @@ DBot.prototype.reloadModules = function() {
|
||||
this.instance.removeListeners();
|
||||
|
||||
moduleNames.each(function(name) {
|
||||
this.status[name] = true;
|
||||
|
||||
var moduleDir = './modules/' + name + '/';
|
||||
var cacheKey = require.resolve(moduleDir + name);
|
||||
delete require.cache[cacheKey];
|
||||
try {
|
||||
var cacheKey = require.resolve(moduleDir + name);
|
||||
delete require.cache[cacheKey];
|
||||
} catch(err) {
|
||||
this.status[name] = 'Error loading module: ' + err + ' ' + err.stack.split('\n')[2].trim();
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
var webKey = require.resolve(moduleDir + 'web');
|
||||
@ -167,8 +174,6 @@ DBot.prototype.reloadModules = function() {
|
||||
delete require.cache[webKey];
|
||||
}
|
||||
|
||||
this.status[name] = true;
|
||||
|
||||
try {
|
||||
// Load the module config data
|
||||
var config = {};
|
||||
|
Loading…
Reference in New Issue
Block a user