valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format all JSON through Salt

Browse Source
This commit is contained in:
Seth House 2012-11-01 11:27:59 -06:00
parent a1b2c478b8
commit 8665b627f9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
saltapi/netapi/rest_cherrypy.py
View File

@ -80,6 +80,11 @@ def error_page_default():
'message': '{0}'.format(cherrypy._cperror.format_exc())}
cherrypy.response.body = [salt.output.out_format(ret, 'json_out', __opts__)]
def json_out_handler(*args, **kwargs):
value = cherrypy.serving.request._json_inner_handler(*args, **kwargs)
return salt.output.out_format(value, 'json_out', __opts__)
class API(object):
url_map = {
'index': LowDataAdapter,
@ -118,6 +123,7 @@ class API(object):
'request.dispatch': cherrypy.dispatch.MethodDispatcher(),
'tools.trailing_slash.on': True,
'request.error_response': error_page_default,
'tools.json_out.handler': json_out_handler,
},
}