Merge pull request #40 from automationator/master

Fixes error handlers

services/web/project/__init__.py

@@ -108,6 +108,10 @@ def create_app():
     from project.docs import bp as docs_bp
     app.register_blueprint(docs_bp)
 
+    # Errors Blueprint
+    from project.errors import bp as errors_bp
+    app.register_blueprint(errors_bp)
+
     # Inject Flask-Security into Flask-Admin so things like current_user and roles
     # work inside the custom view models.
     @security_ctx.context_processor

services/web/project/errors/__init__.py

@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+bp = Blueprint('errors', __name__)
+
+from project.errors import handlers

services/web/project/errors/handlers.py

@@ -0,0 +1,24 @@
+from flask import request
+
+from project import db
+from project.errors import bp
+from project.api.errors import error_response
+from project.gui.views import DefaultView
+
+
+@bp.app_errorhandler(404)
+def not_found_error(error):
+    if request.path.startswith('/api/'):
+        return error_response(404, 'API endpoint not found')
+    else:
+        return DefaultView().render('errors/404.html'), 404
+
+
+@bp.app_errorhandler(500)
+def internal_error(error):
+    if request.path.startswith('/api/'):
+        db.session.rollback()
+        return error_response(500, 'Internal server error')
+    else:
+
+        return DefaultView().render('errors/500.html'), 500

services/web/project/gui/__init__.py

@@ -26,5 +26,4 @@
 admin.add_link(LoginMenuLink(name='Login', url='/login'))
 admin.add_link(LogoutMenuLink(name='Logout', url='/logout'))
 
-from project.gui import handlers
 from project.gui import routes