darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-05 16:28:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

pin marshmallow and update flask error handling

Browse Source
This commit is contained in:
Leo Hemsted
2019-09-04 12:14:28 +01:00
parent 01c702535d
commit 51f90c17fd
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/errors.py
View File

@@ -111,5 +111,8 @@ def register_errors(blueprint):
@blueprint.app_errorhandler(500) @blueprint.app_errorhandler(500)
@blueprint.errorhandler(Exception) @blueprint.errorhandler(Exception)
def internal_server_error(e): def internal_server_error(e):
# if e is a werkzeug InternalServerError then it may wrap the original exception. For more details see:
# https://flask.palletsprojects.com/en/1.1.x/errorhandling/?highlight=internalservererror#unhandled-exceptions
e = getattr(e, 'original_exception', e)
current_app.logger.exception(e) current_app.logger.exception(e)
return jsonify(result='error', message="Internal server error"), 500 return jsonify(result='error', message="Internal server error"), 500

2
requirements-app.txt
View File

@@ -15,7 +15,7 @@ gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching
iso8601==0.1.12 iso8601==0.1.12
jsonschema==3.0.2 jsonschema==3.0.2
marshmallow-sqlalchemy==0.17.0 marshmallow-sqlalchemy==0.17.0
marshmallow==3.0.1 marshmallow==2.20.2 # pyup: <3 throws errors
psycopg2-binary==2.8.3 psycopg2-binary==2.8.3
PyJWT==1.7.1 PyJWT==1.7.1
SQLAlchemy==1.3.8 SQLAlchemy==1.3.8

2
requirements.txt
View File

@@ -17,7 +17,7 @@ gunicorn==19.7.1 # pyup: ignore, >19.8 breaks eventlet patching
iso8601==0.1.12 iso8601==0.1.12
jsonschema==3.0.2 jsonschema==3.0.2
marshmallow-sqlalchemy==0.17.0 marshmallow-sqlalchemy==0.17.0
marshmallow==3.0.1 marshmallow==2.20.2 # pyup: <3 throws errors
psycopg2-binary==2.8.3 psycopg2-binary==2.8.3
PyJWT==1.7.1 PyJWT==1.7.1
SQLAlchemy==1.3.8 SQLAlchemy==1.3.8