fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better plugin error handling

This commit is contained in:
Egil Moeller 2012-02-25 13:37:47 +01:00
parent a89c81f62f
commit 26d9c3ed53
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/pluginfw/hooks.js
View File

@ -2,6 +2,16 @@ var plugins = require("./plugins");
var async = require("async"); var async = require("async");
var hookCallWrapper = function (hook, hook_name, args, cb) {
if (cb === undefined) cb = function (x) { return x; };
try {
return hook.hook(hook_name, args, cb);
} catch (ex) {
console.error([hook_name, hook.part.full_name, ex]);
}
}
/* Don't use Array.concat as it flatterns arrays within the array */ /* Don't use Array.concat as it flatterns arrays within the array */
exports.flatten = function (lst) { exports.flatten = function (lst) {
var res = []; var res = [];
@ -20,7 +30,7 @@ exports.flatten = function (lst) {
exports.callAll = function (hook_name, args) { exports.callAll = function (hook_name, args) {
if (plugins.hooks[hook_name] === undefined) return []; if (plugins.hooks[hook_name] === undefined) return [];
return exports.flatten(plugins.hooks[hook_name].map(function (hook) { return exports.flatten(plugins.hooks[hook_name].map(function (hook) {
return hook.hook(hook_name, args, function (x) { return x; }); return hookCallWrapper(hook, hook_name, args);
})); }));
} }
@ -29,7 +39,7 @@ exports.aCallAll = function (hook_name, args, cb) {
async.map( async.map(
plugins.hooks[hook_name], plugins.hooks[hook_name],
function (hook, cb) { function (hook, cb) {
hook.hook(hook_name, args, function (res) { cb(null, res); }); hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); });
}, },
function (err, res) { function (err, res) {
cb(exports.flatten(res)); cb(exports.flatten(res));
@ -39,10 +49,10 @@ exports.aCallAll = function (hook_name, args, cb) {
exports.callFirst = function (hook_name, args) { exports.callFirst = function (hook_name, args) {
if (plugins.hooks[hook_name][0] === undefined) return []; if (plugins.hooks[hook_name][0] === undefined) return [];
return exports.flatten(plugins.hooks[hook_name][0].hook(hook_name, args, function (x) { return x; })); return exports.flatten(hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args));
} }
exports.aCallFirst = function (hook_name, args, cb) { exports.aCallFirst = function (hook_name, args, cb) {
if (plugins.hooks[hook_name][0] === undefined) cb([]); if (plugins.hooks[hook_name][0] === undefined) cb([]);
plugins.hooks[hook_name][0].hook(hook_name, args, function (res) { cb(exports.flatten(res)); }); hookCallWrapper(plugins.hooks[hook_name][0], hook_name, args, function (res) { cb(exports.flatten(res)); });
} }

7
node/pluginfw/plugins.js
View File

@ -80,7 +80,12 @@ exports.extractHooks = function (parts) {
Object.keys(part.hooks || {}).forEach(function (hook_name) { Object.keys(part.hooks || {}).forEach(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = []; if (hooks[hook_name] === undefined) hooks[hook_name] = [];
var hook_fn_name = part.hooks[hook_name]; var hook_fn_name = part.hooks[hook_name];
hooks[hook_name].push({"hook": exports.loadFn(part.hooks[hook_name]), "part": part}); var hook_fn = exports.loadFn(part.hooks[hook_name]);
if (hook_fn) {
hooks[hook_name].push({"hook": hook_fn, "part": part});
} else {
console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]);
}
}); });
}); });
return hooks; return hooks;