[checkmk-commits] Removed superfluous decorator redefinition.

Module: check_mk Branch: master Commit: 79cd7899f522516ce9a7fe9667e4f3e980ffd9a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79cd7899f52251… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 15 09:05:36 2019 +0200 Removed superfluous decorator redefinition. This basically reverts 6f48926edb. Change-Id: I98167e8eb654c6c2a76509b81102165818daaae7 --- checks/docker_container_status | 36 ------------------------------------ checks/docker_node_disk_usage | 36 ------------------------------------ checks/docker_node_info | 36 ------------------------------------ checks/legacy_docker.include | 2 +- 4 files changed, 1 insertion(+), 109 deletions(-) diff --git a/checks/docker_container_status b/checks/docker_container_status index e5cd0fb..69649fa 100644 --- a/checks/docker_container_status +++ b/checks/docker_container_status @@ -25,42 +25,6 @@ # Boston, MA 02110-1301 USA. -# TODO: see why it's not enough to have it in legacy_docker.include -def append_deprecation_warning(check_function): # pylint: disable=function-redefined - '''A wrapper to WARN if legacy code is used - - If the parse result is of one of the legacy Types the decorated - check function will yield an additional WARNING state. - - These legacy parse results correspond to agents/plugins from version - 1.5.0b1 to 1.5.0p12 - ''' - - @functools.wraps(check_function) - def wrapper(item, params, parsed): - - is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) - catch_these = Exception if is_deprecated else () - - try: - results = check_function(item, params, parsed) - if isinstance(results, tuple): - yield results - else: - for result in results: - yield result - except catch_these: - yield 3, "Could not handle data" - finally: - if is_deprecated: - yield 1, ("Deprecated plugin/agent (see long output)(!)\n" - "You are using legacy code, which may lead to crashes and/or" - " incomplete information. Please upgrade the monitored host to" - " use the plugin 'mk_docker.py'.") - - return wrapper - - def parse_docker_container_status(info): '''process the first line to a JSON object diff --git a/checks/docker_node_disk_usage b/checks/docker_node_disk_usage index 7b564f0..d5355e2 100644 --- a/checks/docker_node_disk_usage +++ b/checks/docker_node_disk_usage @@ -25,42 +25,6 @@ # Boston, MA 02110-1301 USA. -# TODO: see why it's not enough to have it in legacy_docker.include -def append_deprecation_warning(check_function): # pylint: disable=function-redefined - '''A wrapper to WARN if legacy code is used - - If the parse result is of one of the legacy Types the decorated - check function will yield an additional WARNING state. - - These legacy parse results correspond to agents/plugins from version - 1.5.0b1 to 1.5.0p12 - ''' - - @functools.wraps(check_function) - def wrapper(item, params, parsed): - - is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) - catch_these = Exception if is_deprecated else () - - try: - results = check_function(item, params, parsed) - if isinstance(results, tuple): - yield results - else: - for result in results: - yield result - except catch_these: - yield 3, "Could not handle data" - finally: - if is_deprecated: - yield 1, ("Deprecated plugin/agent (see long output)(!)\n" - "You are using legacy code, which may lead to crashes and/or" - " incomplete information. Please upgrade the monitored host to" - " use the plugin 'mk_docker.py'.") - - return wrapper - - def parse_docker_node_disk_usage(info): version = docker_get_version(info) # pylint: disable=undefined-variable diff --git a/checks/docker_node_info b/checks/docker_node_info index 56a4324..c1614f0 100644 --- a/checks/docker_node_info +++ b/checks/docker_node_info @@ -25,42 +25,6 @@ # Boston, MA 02110-1301 USA. -# TODO: see why it's not enough to have it in legacy_docker.include -def append_deprecation_warning(check_function): # pylint: disable=function-redefined - '''A wrapper to WARN if legacy code is used - - If the parse result is of one of the legacy Types the decorated - check function will yield an additional WARNING state. - - These legacy parse results correspond to agents/plugins from version - 1.5.0b1 to 1.5.0p12 - ''' - - @functools.wraps(check_function) - def wrapper(item, params, parsed): - - is_deprecated = isinstance(parsed, (DeprecatedDict, DeprecatedList)) - catch_these = Exception if is_deprecated else () - - try: - results = check_function(item, params, parsed) - if isinstance(results, tuple): - yield results - else: - for result in results: - yield result - except catch_these: - yield 3, "Could not handle data" - finally: - if is_deprecated: - yield 1, ("Deprecated plugin/agent (see long output)(!)\n" - "You are using legacy code, which may lead to crashes and/or" - " incomplete information. Please upgrade the monitored host to" - " use the plugin 'mk_docker.py'.") - - return wrapper - - def parse_docker_node_info(info): version = docker_get_version(info) # pylint: disable=undefined-variable if version is None: diff --git a/checks/legacy_docker.include b/checks/legacy_docker.include index 365f621..e114f63 100644 --- a/checks/legacy_docker.include +++ b/checks/legacy_docker.include @@ -36,7 +36,7 @@ class DeprecatedList(list): pass -def append_deprecation_warning(check_function): # pylint: disable=function-redefined +def append_deprecation_warning(check_function): '''A wrapper to WARN if legacy code is used If the parse result is of one of the legacy Types the decorated