From b6a711a70d2fd6050dd6264d3bab0eea82016b26 Mon Sep 17 00:00:00 2001 From: Silthus Date: Thu, 17 Dec 2020 12:44:36 +0100 Subject: [PATCH] feat: add excludes file debug output --- src/restic_compose_backup/cli.py | 26 ++++++++++++++++++++++++-- src/restic_compose_backup/utils.py | 10 ++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/restic_compose_backup/cli.py b/src/restic_compose_backup/cli.py index b8d7a23..4242c61 100644 --- a/src/restic_compose_backup/cli.py +++ b/src/restic_compose_backup/cli.py @@ -103,19 +103,41 @@ def status(config, containers): ping == 0 ) for mount in container.filter_mounts(): + source = container.get_volume_backup_destination(mount, '/minecraft') logger.info( ' - volume: %s -> %s', mount.source, - container.get_volume_backup_destination(mount, '/minecraft'), + source, ) + excludes_file = os.path.join(source, "excludes.txt") + logger.debug( + 'excludes_file location: %s', + excludes_file + ) + if os.path.isfile(excludes_file): + logger.info( + ' excluding: %s', + utils.join_file_content(excludes_file) + ) if container.volume_backup_enabled: for mount in container.filter_mounts(): + source = container.get_volume_backup_destination(mount, '/volumes') logger.info( ' - volume: %s -> %s', mount.source, - container.get_volume_backup_destination(mount, '/volumes'), + source, ) + excludes_file = os.path.join(source, "excludes.txt") + logger.debug( + 'excludes_file location: %s', + excludes_file + ) + if os.path.isfile(excludes_file): + logger.info( + ' excluding: %s', + utils.join_file_content(excludes_file) + ) if container.database_backup_enabled: instance = container.instance diff --git a/src/restic_compose_backup/utils.py b/src/restic_compose_backup/utils.py index 17a1149..c1f4510 100644 --- a/src/restic_compose_backup/utils.py +++ b/src/restic_compose_backup/utils.py @@ -63,6 +63,16 @@ def remove_containers(containers: List['Container']): except Exception as ex: logger.exception(ex) +def join_file_content(file): + if not os.path.isfile(file): + return "" + with open(file) as c: + output = "" + lines = c.readlines() + for i in range(len(lines)): + output += lines[i] + "," + return output + def is_true(value): """