mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-26 02:49:16 -04:00
Fixed up the health check page
This commit is contained in:
@@ -183,15 +183,3 @@ def register_errorhandlers(application):
|
||||
return useful_headers_after_request(resp)
|
||||
for errcode in [401, 404, 403, 500]:
|
||||
application.errorhandler(errcode)(render_error)
|
||||
|
||||
|
||||
def get_app_version():
|
||||
build = 'n/a'
|
||||
build_time = "n/a"
|
||||
try:
|
||||
from app import version
|
||||
build = version.__build__
|
||||
build_time = version.__time__
|
||||
except:
|
||||
pass
|
||||
return build, build_time
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
__build__ = ""
|
||||
__time__ = ""
|
||||
__travis_commit__ = "dev"
|
||||
__time__ = "dev"
|
||||
__travis_job_number__ = "dev"
|
||||
|
||||
Reference in New Issue
Block a user