X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fbackupninja.git;a=blobdiff_plain;f=src%2Flib%2Fbackupninja%2Faction.py;h=7c80148d9c24f15f86e1c49892449e81c62d7e2b;hp=66fc5f364830f5b5221db05e44eab691a6115534;hb=ac66ee385bda4a477e5501880ff945be6abc5f06;hpb=75bf976607685eddaaab1d5239408b8f545ce158 diff --git a/src/lib/backupninja/action.py b/src/lib/backupninja/action.py index 66fc5f3..7c80148 100644 --- a/src/lib/backupninja/action.py +++ b/src/lib/backupninja/action.py @@ -33,6 +33,7 @@ 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) except OSError, e: @@ -49,10 +50,11 @@ def run_action(action, opts, global_config): Run a single action. opts are the parsed commandline options, global_config is the parsed global configuration. """ + log.info('Running action "%s"', action) # 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 = action.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) return (action_name, action_ty) = parts @@ -63,7 +65,7 @@ def run_action(action, opts, global_config): # Create a handler for this action handler = handlers.create_handler(action_ty, action_config) # Run it - handler.run() - handler.finish() + handler.run(test=opts.test) + handler.finish(test=opts.test) except Exception, e: log.error('Running action "%s" failed: %s', action, e)