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

we were not jsonify-ing

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-01 13:23:36 -06:00
parent ee76aac6f4
commit ca477006ce
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
saltapi/netapi/rest_flask.py
View File

@ -52,17 +52,15 @@ class JobsView(MethodView):
'''
Return information on a previously run job
'''
self.runners['jobs.lookup_jid'](jid)
# TODO: add cache headers based on the keep_jobs settings
ret = self.local.cmd('*', ['grains.items', 'sys.list_functions'], [[], []])
ret = self.runners['jobs.lookup_jid'](jid)
return jsonify(ret)
def get_jobs_list(self):
'''
Return a previously run jobs
'''
return self.runners['jobs.list_jobs']()
ret = self.runners['jobs.list_jobs']()
return jsonify(ret)
def get(self, jid=None):
'''