[checkmk-commits] store.py now explicitely checks for MKTimeout exceptions

Module: check_mk Branch: master Commit: b8168c71d82c7f174bd568cdb9811be94cbfe0d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8168c71d82c7f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:08:59 2018 +0100 store.py now explicitely checks for MKTimeout exceptions Change-Id: I44cc36b7c1edf28404b45ce49a1f74cb71f32910 --- cmk/store.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk/store.py b/cmk/store.py index 941cc1d..9b83960 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -35,7 +35,7 @@ import pprint import tempfile import time -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout from cmk.i18n import _ # TODO: Make all methods handle paths the same way. e.g. mkdir() and makedirs() @@ -104,6 +104,8 @@ def load_mk_file(path, default=None, lock=False): else: raise + except MKTimeout: + raise except Exception, e: # TODO: How to handle debug mode or logging? raise MKGeneralException(_("Cannot read configuration file \"%s\": %s") % (path, e)) @@ -143,6 +145,8 @@ def load_data_from_file(path, default=None, lock=False): raise + except MKTimeout: + raise except Exception, e: if lock: release_lock(path) @@ -215,6 +219,8 @@ def save_file(path, content, mode=0660): os.rename(tmp_path, path) + except MKTimeout: + raise except Exception, e: # In case an exception happens during saving cleanup the tempfile created for writing try: