Merge remote-tracking branch 'origin/master' into rustedbuilds

This commit is contained in:
jakedt 2014-02-25 17:00:38 -05:00
commit de49ce151b
14 changed files with 124 additions and 50 deletions

View file

@ -90,12 +90,14 @@ def common_login(db_user):
@app.errorhandler(model.DataModelException)
def handle_dme(ex):
return make_response(ex.message, 400)
logger.exception(ex)
return make_response('Internal Server Error', 500)
@app.errorhandler(KeyError)
def handle_dme_key_error(ex):
return make_response(ex.message, 400)
logger.exception(ex)
return make_response('Internal Server Error', 500)
def generate_csrf_token():