From e2dec9ffa0c7eff882482161b7b2af77daeb49ee Mon Sep 17 00:00:00 2001 From: Einar Forselv Date: Sat, 7 Dec 2019 23:59:27 +0100 Subject: [PATCH] Move all labels into enums module This way we have more control over them --- src/restic_compose_backup/containers.py | 18 ++++++++++-------- src/restic_compose_backup/enums.py | 11 +++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 src/restic_compose_backup/enums.py diff --git a/src/restic_compose_backup/containers.py b/src/restic_compose_backup/containers.py index 619d2cc..4b3c9ab 100644 --- a/src/restic_compose_backup/containers.py +++ b/src/restic_compose_backup/containers.py @@ -2,7 +2,8 @@ import os from pathlib import Path from typing import List -from restic_compose_backup import utils +from restic_compose_backup import enums, utils + VOLUME_TYPE_BIND = "bind" VOLUME_TYPE_VOLUME = "volume" @@ -27,8 +28,8 @@ class Container: if self._labels is None: raise ValueError('Container meta missing Config->Labels') - self._include = self._parse_pattern(self.get_label('restic-compose-backup.volumes.include')) - self._exclude = self._parse_pattern(self.get_label('restic-compose-backup.volumes.exclude')) + self._include = self._parse_pattern(self.get_label(enums.LABEL_VOLUMES_INCLUDE)) + self._exclude = self._parse_pattern(self.get_label(enums.LABEL_VOLUMES_EXCLUDE)) @property def instance(self) -> 'Container': @@ -108,7 +109,7 @@ class Container: @property def volume_backup_enabled(self) -> bool: """bool: If the ``restic-compose-backup.volumes`` label is set""" - return utils.is_true(self.get_label('restic-compose-backup.volumes')) + return utils.is_true(self.get_label(enums.LABEL_VOLUMES_ENABLED)) @property def database_backup_enabled(self) -> bool: @@ -122,22 +123,22 @@ class Container: @property def mysql_backup_enabled(self) -> bool: """bool: If the ``restic-compose-backup.mysql`` label is set""" - return utils.is_true(self.get_label('restic-compose-backup.mysql')) + return utils.is_true(self.get_label(enums.LABEL_MYSQL_ENABLED)) @property def mariadb_backup_enabled(self) -> bool: """bool: If the ``restic-compose-backup.mariadb`` label is set""" - return utils.is_true(self.get_label('restic-compose-backup.mariadb')) + return utils.is_true(self.get_label(enums.LABEL_MARIADB_ENABLED)) @property def postgresql_backup_enabled(self) -> bool: """bool: If the ``restic-compose-backup.postgres`` label is set""" - return utils.is_true(self.get_label('restic-compose-backup.postgres')) + return utils.is_true(self.get_label(enums.LABEL_POSTGRES_ENABLED)) @property def is_backup_process_container(self) -> bool: """Is this container the running backup process?""" - return self.get_label('restic-compose-backup.backup_process') == 'True' + return self.get_label(enums.LABEL_BACKUP_PROCESS) == 'True' @property def is_running(self) -> bool: @@ -314,6 +315,7 @@ class RunningContainers: self.containers = [] self.this_container = None self.backup_process_container = None + self.stale_backup_process_containers = [] # Find the container we are running in. # If we don't have this information we cannot continue diff --git a/src/restic_compose_backup/enums.py b/src/restic_compose_backup/enums.py new file mode 100644 index 0000000..e8261be --- /dev/null +++ b/src/restic_compose_backup/enums.py @@ -0,0 +1,11 @@ + +# Labels +LABEL_VOLUMES_ENABLED = 'restic-compose-backup.volumes' +LABEL_VOLUMES_INCLUDE = 'restic-compose-backup.volumes.include' +LABEL_VOLUMES_EXCLUDE = 'restic-compose-backup.volumes.exclude' + +LABEL_MYSQL_ENABLED = 'restic-compose-backup.mysql' +LABEL_POSTGRES_ENABLED = 'restic-compose-backup.postgres' +LABEL_MARIADB_ENABLED = 'restic-compose-backup.mariadb' + +LABEL_BACKUP_PROCESS = 'restic-compose-backup.backup_process'