[checkmk-commits] Moved cmk_base.exceptions.MKTimeout to cmk.exceptions

Module: check_mk Branch: master Commit: 9fb709fc4be2856effd0ac3259fd4a1a819093f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb709fc4be285… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:06:27 2018 +0100 Moved cmk_base.exceptions.MKTimeout to cmk.exceptions Change-Id: I61ee5af744532777b6cb57c08aee7c7df27d0bbc --- cmk/exceptions.py | 8 ++++++++ cmk/gui/exceptions.py | 4 ++-- cmk_base/automations/__init__.py | 2 +- cmk_base/checking.py | 4 ++-- cmk_base/classic_snmp.py | 4 ++-- cmk_base/core.py | 3 +-- cmk_base/data_sources/abstract.py | 4 ++-- cmk_base/data_sources/programs.py | 3 ++- cmk_base/decorator.py | 4 ++-- cmk_base/discovery.py | 4 ++-- cmk_base/exceptions.py | 7 ------- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/cmk/exceptions.py b/cmk/exceptions.py index 7b6c430..cd25954 100644 --- a/cmk/exceptions.py +++ b/cmk/exceptions.py @@ -82,3 +82,11 @@ class MKBailOut(Exception): def __str__(self): return self.reason + + +# This exception is raised when a previously configured timeout is reached. +# It is used during keepalive mode. It is also used by the automations +# which have a timeout set. +class MKTimeout(MKException): + pass + diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index 96c4faf..cf991ce 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -29,10 +29,10 @@ from typing import Optional # pylint: disable=unused-import import cmk.gui.http_status from cmk.gui.i18n import _ -from cmk.exceptions import MKGeneralException, MKException +from cmk.exceptions import MKGeneralException, MKException, MKTimeout -class RequestTimeout(MKException): +class RequestTimeout(MKTimeout): """Is raised from the alarm signal handler (handle_request_timeout()) to abort page processing before the system apache times out.""" pass diff --git a/cmk_base/automations/__init__.py b/cmk_base/automations/__init__.py index 8f98e2b..1e6fea4 100644 --- a/cmk_base/automations/__init__.py +++ b/cmk_base/automations/__init__.py @@ -29,13 +29,13 @@ import sys import pprint import cmk.debug +from cmk.exceptions import MKTimeout from cmk.plugin_loader import load_plugins import cmk_base.utils import cmk_base.config as config import cmk_base.console as console import cmk_base.profiling as profiling -from cmk_base.exceptions import MKTimeout import cmk_base.check_api as check_api diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 45ba3f5..dc4608e 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -42,7 +42,7 @@ import cmk import cmk.defines as defines import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout from cmk.regex import regex import cmk_base.utils @@ -53,7 +53,7 @@ import cmk_base.ip_lookup as ip_lookup import cmk_base.data_sources as data_sources import cmk_base.item_state as item_state import cmk_base.check_table as check_table -from cmk_base.exceptions import MKTimeout, MKParseFunctionError +from cmk_base.exceptions import MKParseFunctionError import cmk_base.check_utils import cmk_base.decorator import cmk_base.check_api_utils as check_api_utils diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index 26a8c27..6ddbba7 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -36,11 +36,11 @@ except NameError: unicode = str # pylint: disable=redefined-builtin import cmk.tty as tty -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.console as console import cmk_base.config as config -from cmk_base.exceptions import MKSNMPError, MKTimeout +from cmk_base.exceptions import MKSNMPError #. # .--SNMP interface------------------------------------------------------. diff --git a/cmk_base/core.py b/cmk_base/core.py index 9907a3c..da835fb 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -33,13 +33,12 @@ import sys import cmk.paths import cmk.debug import cmk.tty as tty -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.console as console import cmk_base.config as config import cmk_base.core_config as core_config import cmk_base.nagios_utils -from cmk_base.exceptions import MKTimeout from cmk_base import config_cache import cmk_base.cleanup diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 507cc0a..af411ac 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -36,7 +36,7 @@ import cmk.paths import cmk.store as store import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking -from cmk.exceptions import MKGeneralException, MKTerminate +from cmk.exceptions import MKGeneralException, MKTerminate, MKTimeout import cmk_base.utils import cmk_base.console as console @@ -44,7 +44,7 @@ import cmk_base.config as config import cmk_base.ip_lookup as ip_lookup import cmk_base.check_api_utils as check_api_utils from cmk_base.exceptions import MKAgentError, MKEmptyAgentData, MKSNMPError, \ - MKTimeout, MKIPAddressLookupError + MKIPAddressLookupError from .host_sections import HostSections diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 41dce4f..8bda013 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -30,10 +30,11 @@ import subprocess import collections import cmk.paths +from cmk.exceptions import MKTimeout import cmk_base.config as config import cmk_base.core_config as core_config -from cmk_base.exceptions import MKAgentError, MKTimeout +from cmk_base.exceptions import MKAgentError from .abstract import CheckMKAgentDataSource diff --git a/cmk_base/decorator.py b/cmk_base/decorator.py index 40f3e91..b2ae97f 100644 --- a/cmk_base/decorator.py +++ b/cmk_base/decorator.py @@ -26,12 +26,12 @@ import cmk import cmk.defines as defines -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.config as config import cmk_base.console as console import cmk_base.crash_reporting -from cmk_base.exceptions import MKTimeout, MKAgentError, MKSNMPError, MKIPAddressLookupError +from cmk_base.exceptions import MKAgentError, MKSNMPError, MKIPAddressLookupError try: import cmk_base.cee.keepalive as keepalive diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index fd8b690..a94f3a9 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -33,7 +33,7 @@ import signal from cmk.regex import regex import cmk.tty as tty import cmk.paths -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.crash_reporting import cmk_base.config as config @@ -45,7 +45,7 @@ import cmk_base.checking as checking import cmk_base.data_sources as data_sources import cmk_base.check_table as check_table import cmk_base.core -from cmk_base.exceptions import MKParseFunctionError, MKTimeout +from cmk_base.exceptions import MKParseFunctionError import cmk_base.cleanup import cmk_base.check_utils import cmk_base.decorator diff --git a/cmk_base/exceptions.py b/cmk_base/exceptions.py index 8d1d891..4cf1897 100644 --- a/cmk_base/exceptions.py +++ b/cmk_base/exceptions.py @@ -74,10 +74,3 @@ class MKSNMPError(Exception): class MKSkipCheck(Exception): pass - - -# This exception is raised when a previously configured timeout is reached. -# It is used during keepalive mode. It is also used by the automations -# which have a timeout set. -class MKTimeout(Exception): - pass