From 96f5b950cf70ac2c4bb7a6432b9eee24f1daef77 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Thu, 10 Jun 2010 08:28:26 +0200
Subject: [PATCH] handlers: Make create_handler throw exceptions on errors.

---
 src/lib/backupninja/handlers/__init__.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/lib/backupninja/handlers/__init__.py b/src/lib/backupninja/handlers/__init__.py
index da07b6d..990c471 100644
--- a/src/lib/backupninja/handlers/__init__.py
+++ b/src/lib/backupninja/handlers/__init__.py
@@ -45,9 +45,7 @@ def create_handler(ty, conf):
     Create a new (subclass of) Handler object for an action with the
     given type. conf is the configuration to pass to the handler.
 
-    If the handler cannot be loaded, it is logged and None is returned
-    (but any exceptions raised by the handler code itself are not
-    handled).
+    If the handler cannot be loaded, an exception is thrown.
     """
     modname = 'backupninja.handlers.%s' % ty
     # Load the handler if it is not loaded yet
@@ -55,27 +53,25 @@ def create_handler(ty, conf):
         try:
             __import__(modname, globals(), locals(), [])
         except ImportError, e:
-            log.error('Cannot load action handler for "%s": %s'
-                     , ty, e)
-            return None
+            # Add some extra info, since the default exception does not
+            # show the full module name.
+            raise ImportError('Cannot load module %s: %s' % (modname, e))
     # Get the module from the module table
     module = sys.modules[modname]
 
     # Check that the module has a "handler" top level function, which
     # should create a new Handler object.
     if not hasattr(module, 'handler'):
-        log.error('Action handler for "%s" (in "%s) is not valid: it '
-                  'does not have a "handler" top level function.'
-                 , ty, module.__file__)
-        return None
+        raise ImportError('%s is not valid: it '
+                          'does not have a "handler" top level function.' 
+                          % (module.__file__))
 
     # Call the "handler" function to create the actual handler
     handler = module.handler(conf)
    
     # Check if the handler returned is really a subclass of Handler
     if not isinstance(handler, Handler):
-        log.error('Action handler for "%s" (in "%s) is not valid: it '
-                  'does not return a subclass of backupninja.handlers.Handler.'
-                 , ty, module.__file__)
-        return None
+        raise TypeError('%s is not valid, %s.handler did not return a '
+                        'subclass of backupninja.handlers.Handler.'
+                        % (module.__file__, modname))
     return handler
-- 
2.30.2