saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add fail-safe in case Salt gives us data we can't serialize

Browse source 
Possibly seen in the wild with return data from a Runner that contains a
strange encoding that the JSON serializer can't handle.
This commit is contained in:
Seth House 2016-08-29 17:57:31 -06:00
parent dc705ff675
commit 6e27fad21f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/netapi/rest_cherrypy/app.py
View file

@ -561,7 +561,12 @@ def hypermedia_handler(*args, **kwargs):
# Transform the output from the handler into the requested output format
cherrypy.response.headers['Content-Type'] = best
out = cherrypy.response.processors[best]
return out(ret)
try:
return out(ret)
except Exception:
msg = 'Could not serialize the return data from Salt.'
logger.debug(msg, exc_info=True)
raise cherrypy.HTTPError(500, msg)
def hypermedia_out():