[checkmk-commits] 5098 FIX Fix sporadic exception during activation

Module: check_mk Branch: master Commit: 7b0f7ba7f4dab6029f703bf15c6ba71b9c4dd786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b0f7ba7f4dab6… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Mon Aug 7 09:33:41 2017 +0200 5098 FIX Fix sporadic exception during activation In some case a race condition could lead to an OSError exception during activation due to vanished files. This has been fixed. --- .werks/5098 | 13 +++++++++++++ web/htdocs/multitar.py | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/5098 b/.werks/5098 new file mode 100644 index 0000000..f98b61b --- /dev/null +++ b/.werks/5098 @@ -0,0 +1,13 @@ +Title: Fix sporadic exception during activation +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502090720 + +In some case a race condition could lead to an OSError exception +during activation due to vanished files. +This has been fixed. diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index b6d3af5..c638d66 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -353,4 +353,11 @@ def wipe_directory(path): if os.path.isdir(p): shutil.rmtree(p) else: - os.remove(p) + try: + os.remove(p) + except OSError as e: + if e.errno == 2: # no such file or directory + continue + else: + raise +