patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nicer exception handling

Browse Source
This commit is contained in:
Edwin Eefting
2020-04-01 14:15:59 +02:00
parent 8f0472e8f5
commit 805d7e3536
1 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/zfs-autobackup
View File

@ -26,7 +26,7 @@ if sys.stdout.isatty():
except ImportError: except ImportError:
pass pass
VERSION="3.0-rc9" VERSION="3.0-rc10"
HEADER="zfs-autobackup v{} - Copyright 2020 E.H.Eefting (edwin@datux.nl)\n".format(VERSION) HEADER="zfs-autobackup v{} - Copyright 2020 E.H.Eefting (edwin@datux.nl)\n".format(VERSION)
class Log: class Log:
@ -1447,6 +1447,7 @@ class ZfsNode(ExecuteNode):
for line in lines: for line in lines:
(name,value,source)=line (name,value,source)=line
dataset=ZfsDataset(self, name) dataset=ZfsDataset(self, name)
dataset.verbose("disse")
return(ret) return(ret)
@ -1541,12 +1542,12 @@ class ZfsAutobackup:
def run(self): def run(self):
try:
self.verbose (HEADER) self.verbose (HEADER)
if self.args.test: if self.args.test:
self.verbose("TEST MODE - SIMULATING WITHOUT MAKING ANY CHANGES") self.verbose("TEST MODE - SIMULATING WITHOUT MAKING ANY CHANGES")
self.set_title("Settings summary") self.set_title("Settings summary")
description="[Source]" description="[Source]"
@ -1651,6 +1652,14 @@ class ZfsAutobackup:
return(fail_count) return(fail_count)
except Exception as e:
self.error("Exception: "+str(e))
if self.args.debug:
raise
except KeyboardInterrupt as e:
self.error("Aborted")
if __name__ == "__main__": if __name__ == "__main__":
zfs_autobackup=ZfsAutobackup() zfs_autobackup=ZfsAutobackup()
sys.exit(zfs_autobackup.run()) sys.exit(zfs_autobackup.run())