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

Be consistent with 'result' key in return data

Browse Source
This commit is contained in:
Seth House 2013-03-20 13:42:47 -06:00
parent 32e7e60da4
commit a63c24289f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
saltapi/netapi/rest_cherrypy/app.py
View File

@ -242,7 +242,7 @@ def hypermedia_handler(*args, **kwargs):
ret = {
'status': cherrypy.response.status,
'message': '{0}'.format(traceback.format_exc(exc))
'return': '{0}'.format(traceback.format_exc(exc))
if cherrypy.config['debug']
else "An unexpected error occurred"}
@ -422,7 +422,7 @@ class LowDataAdapter(object):
'''
return {
'status': cherrypy.response.status,
'message': "Welcome",
'return': "Welcome",
}
def POST(self, **kwargs):
@ -719,7 +719,7 @@ class Login(LowDataAdapter):
return {
'status': cherrypy.response.status,
'message': "Please log in",
'return': "Please log in",
}
def POST(self, **kwargs):
@ -756,7 +756,7 @@ class Login(LowDataAdapter):
X-Auth-Token: 6d1b722e
Set-Cookie: session_id=6d1b722e; expires=Sat, 17 Nov 2012 03:23:52 GMT; Path=/
{"result": {
{"return": {
"token": "6d1b722e",
"start": 1363805943.776223,
"expire": 1363849143.776224,
@ -792,7 +792,7 @@ class Login(LowDataAdapter):
# Grab eauth config for the current backend for the current user
perms = self.opts['external_auth'][token['eauth']][token['name']]
return {'result': {
return {'return': {
'token': cherrypy.session.id,
'expire': token['expire'],
'start': token['start'],