rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-defunct-error-handler' into 'master'

Browse source 
Remove vestigial error handling code

See merge request openflexure/openflexure-microscope-server!137
This commit is contained in:
Kaspar Emanuel 2021-09-07 13:20:46 +00:00
commit c5f47c922c
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
openflexure_microscope/api/app.py
View file

@ -24,7 +24,7 @@ import os
from datetime import datetime from datetime import datetime
import pkg_resources import pkg_resources
from flask import abort, jsonify, send_file from flask import abort, send_file
from flask_cors import CORS, cross_origin from flask_cors import CORS, cross_origin
from labthings import create_app from labthings import create_app
from labthings.extensions import find_extensions from labthings.extensions import find_extensions
@ -108,19 +108,6 @@ app, labthing = create_app(
# Enable CORS for some routes outside of LabThings # Enable CORS for some routes outside of LabThings
cors: CORS = CORS(app) cors: CORS = CORS(app)
# Enable correct handling of Marshmallow/Webargs validation errors
# Return validation errors as JSON
# (see https://webargs.readthedocs.io/en/latest/framework_support.html)
@app.errorhandler(422)
@app.errorhandler(400)
def handle_error(err):
headers = err.data.get("headers", None)
messages = err.data.get("messages", ["Invalid request."])
if headers:
return jsonify({"errors": messages}), err.code, headers
else:
return jsonify({"errors": messages}), err.code
# Use custom JSON encoder # Use custom JSON encoder
labthing.json_encoder = JSONEncoder labthing.json_encoder = JSONEncoder