From 091c07bbe27d272946175caa3755d9fcd6ca2e61 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Fri, 26 Nov 2021 11:27:15 +0800 Subject: [PATCH 1/2] Add context for various hooks. --- borgmatic/commands/borgmatic.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 255ee83..8ea9c34 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -62,6 +62,11 @@ def run_configuration(config_filename, config, arguments): prune_create_or_check = {'prune', 'create', 'check'}.intersection(arguments) monitoring_log_level = verbosity_to_log_level(global_arguments.monitoring_verbosity) + hook_context = { + 'repository': ','.join(location['repositories']), + 'configuration_filename': config_filename, + } + try: if prune_create_or_check: dispatch.call_hooks( @@ -79,6 +84,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'pre-prune', global_arguments.dry_run, + **hook_context, ) if 'create' in arguments: command.execute_hook( @@ -87,6 +93,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'pre-backup', global_arguments.dry_run, + **hook_context, ) if 'check' in arguments: command.execute_hook( @@ -95,6 +102,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'pre-check', global_arguments.dry_run, + **hook_context, ) if 'extract' in arguments: command.execute_hook( @@ -103,6 +111,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'pre-extract', global_arguments.dry_run, + **hook_context, ) if prune_create_or_check: dispatch.call_hooks( @@ -168,6 +177,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'post-prune', global_arguments.dry_run, + **hook_context, ) if 'create' in arguments: dispatch.call_hooks( @@ -184,6 +194,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'post-backup', global_arguments.dry_run, + **hook_context, ) if 'check' in arguments: command.execute_hook( @@ -192,6 +203,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'post-check', global_arguments.dry_run, + **hook_context, ) if 'extract' in arguments: command.execute_hook( @@ -200,6 +212,7 @@ def run_configuration(config_filename, config, arguments): config_filename, 'post-extract', global_arguments.dry_run, + **hook_context, ) if prune_create_or_check: dispatch.call_hooks( @@ -239,6 +252,7 @@ def run_configuration(config_filename, config, arguments): repository=error_repository, error=encountered_error, output=getattr(encountered_error, 'output', ''), + configuration_filename=config_filename, ) dispatch.call_hooks( 'ping_monitor', From 0014b149f8188d66213b9b3980730017416d716a Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Fri, 26 Nov 2021 11:38:58 +0800 Subject: [PATCH 2/2] remove configuration_filename as it's already set. --- borgmatic/commands/borgmatic.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 8ea9c34..2af1614 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -64,7 +64,6 @@ def run_configuration(config_filename, config, arguments): hook_context = { 'repository': ','.join(location['repositories']), - 'configuration_filename': config_filename, } try: @@ -252,7 +251,6 @@ def run_configuration(config_filename, config, arguments): repository=error_repository, error=encountered_error, output=getattr(encountered_error, 'output', ''), - configuration_filename=config_filename, ) dispatch.call_hooks( 'ping_monitor',