summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2017-07-21 14:53:33 +0200
committerRodolfo Carvalho <rhcarvalho@gmail.com>2017-07-27 16:30:18 +0200
commit85bb52d586297233728d331e37ef238e902bfeac (patch)
tree5491c052a5b48773045d16a649546cedd4d999ef
parente61819d89f52beddfa244e825931e068872f44f2 (diff)
downloadopenshift-85bb52d586297233728d331e37ef238e902bfeac.tar.gz
openshift-85bb52d586297233728d331e37ef238e902bfeac.tar.bz2
openshift-85bb52d586297233728d331e37ef238e902bfeac.tar.xz
openshift-85bb52d586297233728d331e37ef238e902bfeac.zip
Make LoggingCheck.run return the correct type
The run method is expected to return a dict. Even though we should not run LoggingCheck by itself, it is still possible to do it and without this change we get an unhandled exception.
-rw-r--r--roles/openshift_health_checker/openshift_checks/logging/logging.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/logging/logging.py b/roles/openshift_health_checker/openshift_checks/logging/logging.py
index a48e1c728..43ba6c406 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/logging.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/logging.py
@@ -11,6 +11,9 @@ from openshift_checks import OpenShiftCheck, OpenShiftCheckException
class LoggingCheck(OpenShiftCheck):
"""Base class for OpenShift aggregated logging component checks"""
+ # FIXME: this should not be listed as a check, since it is not meant to be
+ # run by itself.
+
name = "logging"
logging_namespace = "logging"
@@ -27,7 +30,7 @@ class LoggingCheck(OpenShiftCheck):
return masters[0] == hostname
def run(self):
- pass
+ return {}
def get_pods_for_component(self, namespace, logging_component):
"""Get all pods for a given component. Returns: list of pods for component, error string"""