diff options
| author | Kamil Rykowski <kamil.rykowski@intel.com> | 2015-04-24 09:54:55 +0200 |
|---|---|---|
| committer | Kamil Rykowski <kamil.rykowski@intel.com> | 2015-04-24 10:11:48 +0200 |
| commit | 7b9709cda90d410e17754e8625f82d7d2255de68 (patch) | |
| tree | db4e0d51dc064bc4ce9c88500cd6902a5babf9d0 | |
| parent | 2abb28639a77907ecae9c04df35040e499046073 (diff) | |
| download | oslo-middleware-7b9709cda90d410e17754e8625f82d7d2255de68.tar.gz | |
Update response body when healthcheck is available
According to the Healthcheck documentation [1]_ the 200 response returns
"OK" as the body if none of the backends report an application issue.
Current implementation returns empty body which is confusing, so it has
been updated to cover the docs.
[1]
http://docs.openstack.org/developer/oslo.middleware/api.html#oslo_middleware.Healthcheck
Change-Id: I5fb9045112658ef74b8a831bc7814f30c9f42053
Closes-bug: 1414646
| -rw-r--r-- | oslo_middleware/healthcheck/disable_by_file.py | 4 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_healthcheck.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo_middleware/healthcheck/disable_by_file.py b/oslo_middleware/healthcheck/disable_by_file.py index 61a55c8..cd438cf 100644 --- a/oslo_middleware/healthcheck/disable_by_file.py +++ b/oslo_middleware/healthcheck/disable_by_file.py @@ -45,10 +45,10 @@ class DisableByFileHealthcheck(pluginbase.HealthcheckBaseExtension): LOG.warning(_LW('DisableByFile healthcheck middleware enabled ' 'without disable_by_file_path set')) return pluginbase.HealthcheckResult(available=True, - reason="") + reason="OK") elif not os.path.exists(path): return pluginbase.HealthcheckResult(available=True, - reason="") + reason="OK") else: return pluginbase.HealthcheckResult(available=False, reason="DISABLED BY FILE") diff --git a/oslo_middleware/tests/test_healthcheck.py b/oslo_middleware/tests/test_healthcheck.py index 46d964c..a9fa2a9 100644 --- a/oslo_middleware/tests/test_healthcheck.py +++ b/oslo_middleware/tests/test_healthcheck.py @@ -54,7 +54,7 @@ class HealthcheckTests(test_base.BaseTestCase): @mock.patch('logging.warn') def test_disablefile_unconfigured(self, fake_warn): conf = {'backends': 'disable_by_file'} - self._do_test(conf, expected_body=b'') + self._do_test(conf, expected_body=b'OK') self.assertIn('disable_by_file', self.app._backends.names()) fake_warn.assert_called_once('DisableByFile healthcheck middleware ' 'enabled without disable_by_file_path ' @@ -63,7 +63,7 @@ class HealthcheckTests(test_base.BaseTestCase): def test_disablefile_enabled(self): conf = {'backends': 'disable_by_file', 'disable_by_file_path': '/foobar'} - self._do_test(conf, expected_body=b'') + self._do_test(conf, expected_body=b'OK') self.assertIn('disable_by_file', self.app._backends.names()) def test_disablefile_disabled(self): |