netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-21 23:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure runner creation failure is not fatal

Browse source
This commit is contained in:
Orsiris de Jong 2023-04-12 10:03:56 +02:00
parent 0e7e6214b9
commit 33310bc1c7
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
npbackup/__main__.py
View file

@ -403,13 +403,10 @@ This is free software, and you are welcome to redistribute it under certain cond
if args.dry_run: if args.dry_run:
dry_run = True dry_run = True
try: npbackup_runner = NPBackupRunner(config_dict=config_dict)
npbackup_runner = NPBackupRunner(config_dict=config_dict) npbackup_runner.dry_run = dry_run
npbackup_runner.dry_run = dry_run npbackup_runner.verbose = _VERBOSE
npbackup_runner.verbose = _VERBOSE logger.info("Backend: {}".format(npbackup_runner.backend_version))
logger.info("Backend: {}".format(npbackup_runner.backend_version))
except ValueError:
logger.critical("Cannot create backend")
if args.check: if args.check:
if npbackup_runner.check_recent_backups(): if npbackup_runner.check_recent_backups():

16
npbackup/core/runner.py
View file

@ -119,20 +119,20 @@ class NPBackupRunner:
self._verbose = False self._verbose = False
self._stdout = None self._stdout = None
self.restic_runner = None self.restic_runner = None
self._minimim_backup_age = None self.minimum_backup_age = None
self._exec_time = None self._exec_time = None
self.is_ready = False self.is_ready = False
# Create an instance of restic wrapper # Create an instance of restic wrapper
if not self.create_restic_runner(): self.create_restic_runner()
raise ValueError("Cannot create backend runner")
# Configure that instance # Configure that instance
self.apply_config_to_restic_runner() self.apply_config_to_restic_runner()
@property @property
def backend_version(self): def backend_version(self) -> bool:
if self.restic_runner: if self.is_ready:
return self.restic_runner.binary_version return self.restic_runner.binary_version
return None
@property @property
def dry_run(self): def dry_run(self):
@ -173,8 +173,10 @@ class NPBackupRunner:
self.apply_config_to_restic_runner() self.apply_config_to_restic_runner()
@property @property
def has_binary(self): def has_binary(self) -> bool:
return True if self.restic_runner.binary else False if self.is_ready:
return True if self.restic_runner.binary else False
return False
@property @property
def exec_time(self): def exec_time(self):