Merge pull request #406 from alphagov/api_500_status_page

Status page now relies on the api passing else a 500 will be returned.

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)

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