archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Custom error handlers: also properly handle non-Werkzeug exceptions.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-09-06 17:10:50 +02:00
parent cf30bb5d62
commit 49c08cba10
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pillar/__init__.py
View File

@@ -286,6 +286,12 @@ class PillarServer(Eve):
def pillar_error_handler(self, error_ob): def pillar_error_handler(self, error_ob):
# 'error_ob' can be any exception. If it's not a Werkzeug exception,
# handle it as a 500.
if not hasattr(error_ob, 'code'):
error_ob.code = 500
error_ob.description = str(error_ob)
if request.full_path.startswith('/%s/' % self.config['URL_PREFIX']): if request.full_path.startswith('/%s/' % self.config['URL_PREFIX']):
from pillar.api.utils import jsonify from pillar.api.utils import jsonify
# This is an API request, so respond in JSON. # This is an API request, so respond in JSON.