Updated status endpoint info from travis build time and commit.

This commit is contained in:
Nicholas Staples
2016-02-02 15:13:22 +00:00
parent 658045e6d7
commit b38b89a17b
3 changed files with 15 additions and 10 deletions

View File

@@ -173,11 +173,13 @@ def register_errorhandlers(application):
application.errorhandler(errcode)(render_error)
def get_app_version():
_version_re = re.compile(r'__version__\s+=\s+(.*)')
version = 'n/a'
dir_path = os.path.dirname(os.path.abspath(__file__))
with open(os.path.join(dir_path, 'version.py'), 'rb') as f:
version = str(ast.literal_eval(_version_re.search(
f.read().decode('utf-8')).group(1)))
return version
def get_api_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

View File

@@ -11,6 +11,8 @@ def status():
api_status = status_api_client.get_status()
except:
api_status = 'n/a'
build, build_time = get_api_version()
return jsonify(status="ok",
app_version=get_app_version(),
api_status=api_status), 200
api_build=build,
api_built_time=build_time), 200

View File

@@ -1 +1,2 @@
__version__ = '0.1.1'
__build__ = ""
__time__ = ""