From aa5fd65171f6ea3eb37251fe8e8a53a2da6769ed Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Wed, 6 Apr 2016 16:36:03 +0100 Subject: [PATCH] Status page now relies on the api passing else a 500 will be returned. --- app/notify_client/status_api_client.py | 2 +- app/status/views/healthcheck.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/notify_client/status_api_client.py b/app/notify_client/status_api_client.py index 0a5f49e87..601dec340 100644 --- a/app/notify_client/status_api_client.py +++ b/app/notify_client/status_api_client.py @@ -13,4 +13,4 @@ class StatusApiClient(BaseAPIClient): self.secret = app.config['ADMIN_CLIENT_SECRET'] def get_status(self, *params): - return self.get(url='/status/_status', *params) + return self.get(url='/_status', *params) diff --git a/app/status/views/healthcheck.py b/app/status/views/healthcheck.py index 0e76ebc37..24ba722e6 100644 --- a/app/status/views/healthcheck.py +++ b/app/status/views/healthcheck.py @@ -1,6 +1,7 @@ from flask import jsonify, request -from app import version +from app import (version, status_api_client) from app.status import status +from notifications_python_client import HTTPError @status.route('/_status', methods=['GET']) @@ -8,8 +9,13 @@ def show_status(): if request.args.get('elb', None): return jsonify(status="ok"), 200 else: + try: + api_status = status_api_client.get_status() + except HTTPError as e: + return jsonify(status="error", message=str(e.message)), 500 return jsonify( status="ok", + api=api_status, travis_commit=version.__travis_commit__, travis_build_number=version.__travis_job_number__, build_time=version.__time__), 200