[checkmk-commits] 4224 FIX Improved exception handling during WATO slave site activation

Module: check_mk Branch: master Commit: 69d7708272a12c57a2a8c98cb7897ee31fd5a07a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69d7708272a12c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 15:20:33 2016 +0100 4224 FIX Improved exception handling during WATO slave site activation Change-Id: Idfc3ba4211ca9707470c40d270755c7f9badc999 --- .werks/4224 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 12 +++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/4224 b/.werks/4224 new file mode 100644 index 0000000..685ef79 --- /dev/null +++ b/.werks/4224 @@ -0,0 +1,9 @@ +Title: Improved exception handling during WATO slave site activation +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482502812 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2d77605..94d3c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names * 4222 FIX: Services of host page: Fixed encoding issue for hosts with umlauts in alias * 4223 FIX: Fixed possible g_host_attribute related AttributeError exception + * 4224 FIX: Improved exception handling during WATO slave site activation Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 6b88730..fdc5865 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4398,6 +4398,13 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): def run(self): try: + self._do_run() + except: + log_exception() + + + def _do_run(self): + try: self._time_started = time.time() self._lock_activation() @@ -5459,9 +5466,8 @@ def collect_hosts(folder): # | host and similar things. | # '----------------------------------------------------------------------' -class MKAutomationException(Exception): - def __init__(self, msg): - super(MKAutomationException, self).__init__(msg) +class MKAutomationException(MKGeneralException): + pass def check_mk_automation(siteid, command, args=None, indata="", stdin_data=None, timeout=None, sync=True):