4 Commits
0.3.2 ... 0.3.3

Author SHA1 Message Date
Einar Forselv
758c3075f1 Bump version 2019-12-06 09:09:05 +01:00
Einar Forselv
9cad6a5c71 Update cli.py 2019-12-06 09:08:48 +01:00
Einar Forselv
4ebe16af14 Properly get the container exit code 2019-12-06 08:21:21 +01:00
Einar Forselv
fd87ddc388 More logging during backup 2019-12-06 08:21:06 +01:00
6 changed files with 14 additions and 8 deletions

View File

@@ -22,7 +22,7 @@ copyright = '2019, Zetta.IO Technology AS'
author = 'Zetta.IO Technology AS' author = 'Zetta.IO Technology AS'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.3.2' release = '0.3.3'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------

View File

@@ -14,8 +14,8 @@ main image as well.
```bash ```bash
docker build src --tag zettaio/restic-compose-backup:0.3 docker build src --tag zettaio/restic-compose-backup:0.3
docker build src --tag zettaio/restic-compose-backup:0.3.2 docker build src --tag zettaio/restic-compose-backup:0.3.3
docker push zettaio/restic-compose-backup:0.3 docker push zettaio/restic-compose-backup:0.3
docker push zettaio/restic-compose-backup:0.3.2 docker push zettaio/restic-compose-backup:0.3.3
``` ```

View File

@@ -1 +1 @@
__version__ = '0.3.2' __version__ = '0.3.3'

View File

@@ -57,9 +57,9 @@ def run(image: str = None, command: str = None, volumes: dict = None,
fd.write('\n') fd.write('\n')
logger.info(line) logger.info(line)
container.wait()
container.reload() container.reload()
logger.debug("Container ExitCode %s", container.attrs['State']['ExitCode']) logger.debug("Container ExitCode %s", container.attrs['State']['ExitCode'])
container.stop()
container.remove() container.remove()
return container.attrs['State']['ExitCode'] return container.attrs['State']['ExitCode']

View File

@@ -143,13 +143,15 @@ def start_backup_process(config, containers):
vol_result = restic.backup_files(config.repository, source='/volumes') vol_result = restic.backup_files(config.repository, source='/volumes')
logger.debug('Volume backup exit code: %s', vol_result) logger.debug('Volume backup exit code: %s', vol_result)
if vol_result != 0: if vol_result != 0:
logger.error('Backup command exited with non-zero code: %s', vol_result) logger.error('Volume backup exited with non-zero code: %s', vol_result)
errors = True errors = True
except Exception as ex: except Exception as ex:
logger.error('Exception raised during volume backup')
logger.exception(ex) logger.exception(ex)
errors = True errors = True
# back up databases # back up databases
logger.info('Backing up databases')
for container in containers.containers_for_backup(): for container in containers.containers_for_backup():
if container.database_backup_enabled: if container.database_backup_enabled:
try: try:
@@ -165,14 +167,18 @@ def start_backup_process(config, containers):
errors = True errors = True
if errors: if errors:
logger.error('Exit code: %s', errors)
exit(1) exit(1)
# Only run cleanup if backup was successful # Only run cleanup if backup was successful
result = cleanup(config, container) result = cleanup(config, container)
logger.debug('cleanup exit code: %s', errors) logger.debug('cleanup exit code: %s', result)
if result != 0: if result != 0:
logger.error('Exit code: %s', result)
exit(1) exit(1)
logger.info('Backup completed')
def cleanup(config, containers): def cleanup(config, containers):
"""Run forget / prune to minimize storage space""" """Run forget / prune to minimize storage space"""

View File

@@ -3,7 +3,7 @@ from setuptools import setup, find_namespace_packages
setup( setup(
name="restic-compose-backup", name="restic-compose-backup",
url="https://github.com/ZettaIO/restic-compose-backup", url="https://github.com/ZettaIO/restic-compose-backup",
version="0.3.2", version="0.3.3",
author="Einar Forselv", author="Einar Forselv",
author_email="eforselv@gmail.com", author_email="eforselv@gmail.com",
packages=find_namespace_packages(include=['restic_compose_backup']), packages=find_namespace_packages(include=['restic_compose_backup']),