From cfe2ffcc23b714804c42109868a964d1b40f1630 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 16 Oct 2020 15:21:13 +0200 Subject: repository: rewrite results processing Drop the use of retcode, as it is not very meaningful. Drop all_ok, as it is not very useful. Catch all exceptions from individual targets and wrap them as failed results. --- example.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'example.py') diff --git a/example.py b/example.py index ba3e09c..1643a17 100755 --- a/example.py +++ b/example.py @@ -1,6 +1,7 @@ #!/usr/bin/python3 import argparse +import logging import sys from lbup.repository import Repo @@ -26,6 +27,8 @@ if args.list_targets: list_targets(tgts) sys.exit(0) +logging.basicConfig(level = logging.INFO) + if len(args.targets) > 0: tgts_run = [] for requested in args.targets: @@ -39,17 +42,18 @@ else: repo = Repo() res = repo.backup(tgts_run) -if not res.all_ok: - sys.stderr.write('Error while backing up:\n') - for tgt, tgt_res in zip(tgts_run, res.target_results): - if tgt_res.retcode == 0: - continue - - sys.stderr.write('Backing up target "%s" failed with code %d, bup output:\n' % - (tgt.name, tgt_res.retcode)) - sys.stderr.write(tgt_res.output.decode('utf-8', errors = 'backslashreplace') + '\n') - - if res.par2_result.retcode != 0: - sys.stderr.write('Generating par2 recovery information failed with code %d, bup output:\n' % - (res.par2_result.retcode)) - sys.stderr.write(res.par2_result.output.decode('utf-8', errors = 'backslashreplace') + '\n') +for tgt, tgt_res in res.target_results.items(): + if tgt_res.success: + continue + + logging.error('Backing up target "%s" failed', tgt) + if tgt_res.output: + output = tgt_res.output.decode('utf-8', errors = 'backslashreplace') + output = '\n'.join((' ' + line for line in output.splitlines())) + logging.error('Target output:') + logging.error('%s', output) + +if not res.par2_result.success: + sys.stderr.write('Generating par2 recovery information failed with code %d, bup output:\n' % + (res.par2_result.retcode)) + sys.stderr.write(res.par2_result.output.decode('utf-8', errors = 'backslashreplace') + '\n') -- cgit v1.2.3