psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reordering hooks a bit so that pre-backup ordering mirrors post-backup ordering.

Browse source
This commit is contained in:
Dan Helfman 2019-10-27 14:47:55 -07:00
parent 5e3c2da79c
commit 4dc4fe0b8d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
borgmatic/commands/borgmatic.py
View file

@ -53,6 +53,9 @@ def run_configuration(config_filename, config, arguments):
if 'create' in arguments: if 'create' in arguments:
try: try:
healthchecks.ping_healthchecks(
hooks.get('healthchecks'), config_filename, global_arguments.dry_run, 'start'
)
command.execute_hook( command.execute_hook(
hooks.get('before_backup'), hooks.get('before_backup'),
hooks.get('umask'), hooks.get('umask'),
@ -63,9 +66,6 @@ def run_configuration(config_filename, config, arguments):
postgresql.dump_databases( postgresql.dump_databases(
hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run
) )
healthchecks.ping_healthchecks(
hooks.get('healthchecks'), config_filename, global_arguments.dry_run, 'start'
)
except (OSError, CalledProcessError) as error: except (OSError, CalledProcessError) as error:
encountered_error = error encountered_error = error
yield from make_error_log_records( yield from make_error_log_records(
@ -94,6 +94,9 @@ def run_configuration(config_filename, config, arguments):
if 'create' in arguments and not encountered_error: if 'create' in arguments and not encountered_error:
try: try:
postgresql.remove_database_dumps(
hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run
)
command.execute_hook( command.execute_hook(
hooks.get('after_backup'), hooks.get('after_backup'),
hooks.get('umask'), hooks.get('umask'),
@ -101,9 +104,6 @@ def run_configuration(config_filename, config, arguments):
'post-backup', 'post-backup',
global_arguments.dry_run, global_arguments.dry_run,
) )
postgresql.remove_database_dumps(
hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run
)
healthchecks.ping_healthchecks( healthchecks.ping_healthchecks(
hooks.get('healthchecks'), config_filename, global_arguments.dry_run hooks.get('healthchecks'), config_filename, global_arguments.dry_run
) )