X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fbackupninja.git;a=blobdiff_plain;f=src%2Flib%2Fbackupninja%2Faction.py;h=fe1947f4fd2b3c8da7599c1f73e3b161ca0f6d1c;hp=66fc5f364830f5b5221db05e44eab691a6115534;hb=HEAD;hpb=75bf976607685eddaaab1d5239408b8f545ce158

diff --git a/src/lib/backupninja/action.py b/src/lib/backupninja/action.py
index 66fc5f3..fe1947f 100644
--- a/src/lib/backupninja/action.py
+++ b/src/lib/backupninja/action.py
@@ -21,6 +21,8 @@
 
 """ Running backup actions """
 
+import os
+import logging
 import logging as log
 
 from backupninja import config
@@ -33,37 +35,52 @@ def run_all_actions(opts, global_config):
     opts are the parsed commandline options, global_config is the parsed
     global configuration.
     """
+    log.info('Running all actions')
     try:
-        actions = config.list_actions(opts)
+        action_configs = config.list_actions(opts)
     except OSError, e:
         log.critical('Unable to list actions: %s', e)
         return
 
-    actions.sort()
+    action_configs.sort()
 
-    for action in actions:
-        run_action(action, opts, global_config)
+    for action_config in action_configs:
+        run_action(action_config, opts, global_config)
 
-def run_action(action, opts, global_config):
+def run_action(action_config, opts, global_config):
     """
-    Run a single action. opts are the parsed commandline options,
+    Run a single action. action_config is the full path to its
+    configuration file. opts are the parsed commandline options,
     global_config is the parsed global configuration.
     """
+    config_name = os.path.basename(action_config)
     # Split the action filename
-    parts = action.split('.', 2)
-    if (len(parts) < 2):
-        log.error('Invalid action filename: "%s". Should be in the form name.type, where type is a valid handler.')
+    parts = os.path.basename(config_name).split('.')
+    if (len(parts) != 2):
+        log.error('Invalid action filename: "%s". Should be in the form name.type, where type is a valid handler.' % action_config)
         return
     (action_name, action_ty) = parts
 
-    # Get the config for this action
-    action_config = config.get_action_config(opts, action)
+    action_log = logging.getLogger(config_name)
+    action_log.info('Running')
 
     try:
         # Create a handler for this action
-        handler = handlers.create_handler(action_ty, action_config)
+        action = handlers.create_action(action_ty, logger=action_log)
+        # Let the handler load its configuration file
+        action.load_config(action_config)
         # Run it
-        handler.run()
-        handler.finish()
+        action.run(test=opts.test)
+        action.finish(test=opts.test)
+        # Ask the action if there where any failures
+        success = not action.failed
     except Exception, e:
-        log.error('Running action "%s" failed: %s', action, e)
+        action_log.error('Unexpected exception: %s', e)
+        import traceback
+        log.debug(traceback.format_exc())
+        success = False
+
+    if success:
+        action_log.info('Succeeded')
+    else:
+        action_log.info('Failed')