[checkmk-commits] added WK 6686 FIX WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir

Module: check_mk Branch: master Commit: 90a7d2e59fae54e211cd94ef42c713a93312fa3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90a7d2e59fae54… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Mon Nov 19 11:13:16 2018 +0100 added WK 6686 FIX WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir Change-Id: Ifb2fbe8626c985c80fa747e8651000d4fb69723f --- .werks/6686 | 10 ++++++++++ cmk/gui/watolib.py | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6686 b/.werks/6686 new file mode 100644 index 0000000..411be22 --- /dev/null +++ b/.werks/6686 @@ -0,0 +1,10 @@ +Title: WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542298205 +Class: fix + +Due to this bug there could be lots of directories/files in <tt>~/tmp/check_mk/wato/activation</tt>. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index a424101..1781d20 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -100,7 +100,7 @@ from cmk.gui.i18n import _u, _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.log import logger -from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError +from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError, RequestTimeout from cmk.gui.valuespec import ( Dictionary, Integer, @@ -5553,7 +5553,9 @@ class ActivateChangesManager(ActivateChanges): try: try: manager.load_activation(activation_id) - except MKUserError: + except RequestTimeout: + raise + except Exception: # Not existant anymore! delete = True raise