Fixed up the health check page

This commit is contained in:
Martyn Inglis
2016-03-03 16:41:21 +00:00
parent 0fd2572b08
commit 76ccb99666
5 changed files with 25 additions and 38 deletions

View File

@@ -1,18 +1,18 @@
from flask import jsonify
from flask import request
from app import version
from app.status import status
@status.route('/_status')
def status():
from app import (get_app_version, status_api_client)
api_status = 'n/a'
try:
api_status = status_api_client.get_status()
except:
api_status = 'n/a'
build, build_time = get_app_version()
return jsonify(status="ok",
api_status=api_status,
api_build=build,
api_built_time=build_time), 200
@status.route('/_status', methods=['GET'])
def show_status():
if request.args.get('elb', None):
return jsonify(status="ok"), 200
else:
return jsonify(
status="ok",
travis_commit=version.__travis_commit__,
travis_build_number=version.__travis_job_number__,
build_time=version.__time__), 200