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

Save runner returns to the master job cache

Browse Source 
... if runner_returns is set to True, of course.
This commit is contained in:
Erik Johnson 2016-08-01 23:05:29 -05:00
parent 369f5e208a
commit 7af9d079f8
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/runner.py
View File

@ -184,6 +184,19 @@ class Runner(RunnerClient):
# Allocate a jid
async_pub = self._gen_async_pub()
if self.opts.get('runner_returns', False):
job_load = {
'jid': async_pub['jid'],
'tgt_type': 'runner',
'tgt': '',
'user': self.opts.get('user', ''),
'fun': self.opts['fun'],
'arg': salt.utils.args.condition_input(args, kwargs),
}
else:
job_load = {}
if low['fun'] == 'state.orchestrate':
low['kwarg']['__pub_orchestration_jid'] = async_pub['jid']
@ -210,6 +223,14 @@ class Runner(RunnerClient):
ret = '{0}'.format(exc)
if not self.opts.get('quiet', False):
display_output(ret, 'nested', self.opts)
return ret
log.debug('Runner return: {0}'.format(ret))
else:
log.debug('Runner return: {0}'.format(ret))
if self.opts.get('runner_returns', False):
# Save the payload to the job cache
job_load['ret'] = ret
save_load_func = '{0}.save_load'.format(
self.opts['master_job_cache'])
self.returners[save_load_func](job_load['jid'], job_load)
return ret