handlers: Make create_action pass any kwargs to the constructor.

[matthijs/projects/backupninja.git] / src / lib / backupninja / handlers / __init__.py

diff --git a/src/lib/backupninja/handlers/__init__.py b/src/lib/backupninja/handlers/__init__.py
index 29dc75631823ed79d5ecda18b99698d6dcacb782..50abb41307c9078444200c86c731e9de284a1cb7 100644 (file)
--- a/src/lib/backupninja/handlers/__init__.py
+++ b/src/lib/backupninja/handlers/__init__.py
@@ -55,6 +55,10 @@ class Action(object):
         # Assume we'll run succesfully. If anything fails in the
         # meanwhile, set this to True.
         self.failed = False
         # Assume we'll run succesfully. If anything fails in the
         # meanwhile, set this to True.
         self.failed = False

+        # A logger object for this action. In the future, this might
+        # become a specific logger, that includes the action name and
+        # type.
+        self.log = log

 
     def run(self, **kwargs):
         """
 
     def run(self, **kwargs):
         """


@@ -103,10 +107,11 @@ class Action(object):
         except ConfigParser.NoOptionError:
             raise config.ConfigError("Option '%s' in section '%s' is mandatory, please configure it" % (option, section))
 
         except ConfigParser.NoOptionError:
             raise config.ConfigError("Option '%s' in section '%s' is mandatory, please configure it" % (option, section))
 

-def create_action(ty):
+def create_action(ty, **kwargs):

     """
     Create a new (subclass of) Action object for an action with the
     """
     Create a new (subclass of) Action object for an action with the

-    given type.
+    given type. Any extra keyword arguments are passed to the
+    constructor.

 
     If the handler class for this type cannot be loaded, an exception is
     thrown.
 
     If the handler class for this type cannot be loaded, an exception is
     thrown.


@@ -133,7 +138,7 @@ def create_action(ty):
                           % (module.__file__))
 
     # Call the "handler" function to create the actual action
                           % (module.__file__))
 
     # Call the "handler" function to create the actual action

-    action = module.handler()
+    action = module.handler(**kwargs)

    
     # Check if the handler returned is really a subclass of Action
     if not isinstance(action, Action):
    
     # Check if the handler returned is really a subclass of Action
     if not isinstance(action, Action):