[checkmk-commits] Check_MK Git: check_mk: #1089 FIX Snapshot restore: fixed exception during exception handling...

Module: check_mk Branch: master Commit: c008c57bc2e1477c6ec36097501c38bbd787ed62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c008c57bc2e147… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 29 11:34:51 2014 +0200 #1089 FIX Snapshot restore: fixed exception during exception handling... If there were an error during the extracting of a backup domain, the backup process crashed entirely instead of continueing with the next backup domain. --- .werks/1089 | 9 +++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1089 b/.werks/1089 new file mode 100644 index 0000000..8f6dff6 --- /dev/null +++ b/.werks/1089 @@ -0,0 +1,9 @@ +Title: Snapshot restore: fixed exception during exception handling... +Level: 1 +Component: wato +Version: 1.2.5i6 +Date: 1406626339 +Class: fix + +If there were an error during the extracting of a backup domain, the backup process +crashed entirely instead of continueing with the next backup domain. diff --git a/ChangeLog b/ChangeLog index 3b88b9f..fa3b013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... + * 1089 FIX: Snapshot restore: fixed exception during exception handling...... 1.2.5i5: diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index d9ddd53..b461070 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -213,9 +213,9 @@ def extract_domains(tar, domains): stdout, stderr = p.communicate() exit_code = p.wait() if exit_code: - return [ "%s - %s" % (domains["title"], stderr) ] + return [ "%s - %s" % (domain["title"], stderr) ] except Exception, e: - return [ "%s - %s" % (domains["title"], str(e)) ] + return [ "%s - %s" % (domain["title"], str(e)) ] def execute_restore(domain, is_pre_restore = True):