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

Merge pull request #21630 from UtahDave/fix_syndic

Browse Source 
WORK IN PROGRESS - Fix syndic
This commit is contained in:
Thomas S Hatch 2015-03-16 14:26:31 -06:00
commit 8a12fbbce8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -1185,7 +1185,7 @@ class AESFuncs(object):
if any(key not in load for key in ('return', 'jid', 'id')):
return None
# if we have a load, save it
if 'load' in load:
if load.get('load'):
fstr = '{0}.save_load'.format(self.opts['master_job_cache'])
self.mminion.returners[fstr](load['jid'], load)
@ -1194,6 +1194,10 @@ class AESFuncs(object):
ret = {'jid': load['jid'],
'id': key,
'return': item}
if 'fun' in load:
ret['fun'] = load['fun']
if 'arg' in load:
ret['fun_args'] = load['arg']
if 'out' in load:
ret['out'] = load['out']
self._return(ret)

3
salt/minion.py
View File

@ -1184,6 +1184,9 @@ class Minion(MinionBase):
'id': self.opts['id'],
'jid': jid,
'fun': fun,
'arg': ret.get('arg'),
'tgt': ret.get('tgt'),
'tgt_type': ret.get('tgt_type'),
'load': ret.get('__load__')}
load['return'] = {}
for key, value in ret.items():