Fixed version file to use new names

This commit is contained in:
Martyn Inglis
2016-03-03 16:27:13 +00:00
parent bfe0ef5520
commit 9b28a6d4ad
2 changed files with 5 additions and 16 deletions

View File

@@ -9,28 +9,17 @@ status = Blueprint('status', __name__)
@status.route('/_status', methods=['GET', 'POST'])
def show_status():
travis_commit, travis_build_number, build_time = get_api_version()
if request.args.get('elb', None):
return jsonify(status="ok"), 200
else:
return jsonify(
status="ok",
travis_commit=travis_commit,
travis_build_number=travis_build_number,
build_time=build_time,
travis_commit=version.__travis_commit__,
travis_build_number=version.__travis_job_number__,
build_time=version.__time__,
db_version=get_db_version()), 200
def get_api_version():
try:
travis_commit = version.__travis_commit__
travis_job_number = version.__travis_job_number__
build_time = version.__time__
return travis_commit, travis_job_number, build_time
except:
pass
def get_db_version():
try:
query = 'SELECT version_num FROM alembic_version'

View File

@@ -2,6 +2,6 @@
#
# Update the version file of the project from the Travis build details
#
sed -i -e "s/__travis_commit__ =.*/__build__ = \"$TRAVIS_COMMIT\"/g" ./app/version.py
sed -i -e "s/__travis_job_number__ =.*/__build__ = \"$TRAVIS_BUILD_NUMBER\"/g" ./app/version.py
sed -i -e "s/__travis_commit__ =.*/__travis_commit__ = \"$TRAVIS_COMMIT\"/g" ./app/version.py
sed -i -e "s/__travis_job_number__ =.*/__travis_job_number__ = \"$TRAVIS_BUILD_NUMBER\"/g" ./app/version.py
sed -i -e "s/__time__ =.*/__time__ = \"$(date +%Y-%m-%d:%H:%M:%S)\"/g" ./app/version.py