darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicholas Staples
2016-04-06 16:36:03 +01:00
parent 2ae33f0179
commit aa5fd65171
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/status_api_client.py
View File

@@ -13,4 +13,4 @@ class StatusApiClient(BaseAPIClient):
self.secret = app.config['ADMIN_CLIENT_SECRET'] self.secret = app.config['ADMIN_CLIENT_SECRET']
def get_status(self, *params): def get_status(self, *params):
return self.get(url='/status/_status', *params) return self.get(url='/_status', *params)

8
app/status/views/healthcheck.py
View File

@@ -1,6 +1,7 @@
from flask import jsonify, request from flask import jsonify, request
from app import version from app import (version, status_api_client)
from app.status import status from app.status import status
from notifications_python_client import HTTPError
@status.route('/_status', methods=['GET']) @status.route('/_status', methods=['GET'])
@@ -8,8 +9,13 @@ def show_status():
if request.args.get('elb', None): if request.args.get('elb', None):
return jsonify(status="ok"), 200 return jsonify(status="ok"), 200
else: else:
try:
api_status = status_api_client.get_status()
except HTTPError as e:
return jsonify(status="error", message=str(e.message)), 500
return jsonify( return jsonify(
status="ok", status="ok",
api=api_status,
travis_commit=version.__travis_commit__, travis_commit=version.__travis_commit__,
travis_build_number=version.__travis_job_number__, travis_build_number=version.__travis_job_number__,
build_time=version.__time__), 200 build_time=version.__time__), 200