From 26d9c3ed53ed84e92fa001ea68bfad36b358d05f Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Sat, 25 Feb 2012 13:37:47 +0100
Subject: [PATCH] Better plugin error handling

---
 node/pluginfw/hooks.js   | 18 ++++++++++++++----
 node/pluginfw/plugins.js |  7 ++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/node/pluginfw/hooks.js b/node/pluginfw/hooks.js
index ae256217b..ed6cef28e 100644
--- a/node/pluginfw/hooks.js
+++ b/node/pluginfw/hooks.js
@@ -2,6 +2,16 @@ var plugins = require("./plugins");
 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 */
 exports.flatten = function (lst) {
   var res = [];
@@ -20,7 +30,7 @@ exports.flatten = function (lst) {
 exports.callAll = function (hook_name, args) {
   if (plugins.hooks[hook_name] === undefined) return [];
   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(
     plugins.hooks[hook_name],
     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) {
       cb(exports.flatten(res));
@@ -39,10 +49,10 @@ exports.aCallAll = function (hook_name, args, cb) {
 
 exports.callFirst = function (hook_name, args) {
   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) {
   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)); });
 }
diff --git a/node/pluginfw/plugins.js b/node/pluginfw/plugins.js
index fcac21c0e..8608e6a0c 100644
--- a/node/pluginfw/plugins.js
+++ b/node/pluginfw/plugins.js
@@ -80,7 +80,12 @@ exports.extractHooks = function (parts) {
     Object.keys(part.hooks || {}).forEach(function (hook_name) {
       if (hooks[hook_name] === undefined) 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;