diff --git a/deployer/__init__.py b/deployer/__init__.py index bac0445..17c682e 100644 --- a/deployer/__init__.py +++ b/deployer/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.1.9' +__version__ = '0.1.10' __author__ = 'sukrit' import logging diff --git a/deployer/services/health.py b/deployer/services/health.py index e5b91e5..a06c250 100644 --- a/deployer/services/health.py +++ b/deployer/services/health.py @@ -72,7 +72,7 @@ def _check_celery(): return 'Celery ping:%s' % output -def get_health(check_celery=False): +def get_health(check_celery=True): """ Gets the health of the all the external services. diff --git a/deployer/views/health.py b/deployer/views/health.py index 02fc930..7bc0006 100644 --- a/deployer/views/health.py +++ b/deployer/views/health.py @@ -31,7 +31,7 @@ def get(self, **kwargs): :return: Flask Json Response containing version. """ - check_celery = request.args.get('celery', 'false').lower() in \ + check_celery = request.args.get('celery', 'true').lower() in \ BOOLEAN_TRUE_VALUES health = get_health(check_celery) failed_checks = [ diff --git a/tests/unit/services/test_health.py b/tests/unit/services/test_health.py index 230dcff..0938246 100644 --- a/tests/unit/services/test_health.py +++ b/tests/unit/services/test_health.py @@ -27,6 +27,7 @@ def test_get_health_when_elasticsearch_is_enabled(client, get_es, ping): """ # Given: Operational external services" + ping.delay().get.return_value = 'pong' get_es().info.return_value = 'mock' EtcdInfo = namedtuple('Info', ('machines', 'leader')) client.Client.return_value = EtcdInfo(['machine1'], 'machine1') @@ -46,6 +47,10 @@ def test_get_health_when_elasticsearch_is_enabled(client, get_es, ping): 'elasticsearch': { 'status': HEALTH_OK, 'details': 'mock' + }, + 'celery': { + 'status': HEALTH_OK, + 'details': 'Celery ping:pong' } }) @@ -61,6 +66,7 @@ def test_get_health_when_elasticsearch_is_disabled(client, ping): """ # Given: Operational external services" + ping.delay().get.return_value = 'pong' EtcdInfo = namedtuple('Info', ('machines', 'leader')) client.Client.return_value = EtcdInfo(['machine1'], 'machine1') @@ -75,7 +81,11 @@ def test_get_health_when_elasticsearch_is_disabled(client, ping): 'machines': ['machine1'], 'leader': 'machine1' } - } + }, + 'celery': { + 'status': HEALTH_OK, + 'details': 'Celery ping:pong' + }, })