Caller needs to pass the fun in the return dict

This commit is contained in:
Thomas S Hatch 2012-10-31 14:34:25 -06:00
parent 498d674409
commit 20577b3705

View File

@ -74,11 +74,13 @@ class Caller(object):
if self.opts.get('return', ''):
ret['id'] = self.opts['id']
ret['jid'] = '{0:%Y%m%d%H%M%S%f}'.format(datetime.datetime.now())
ret['fun'] = fun
for returner in self.opts['return'].split(','):
try:
self.minion.returners['{0}.returner'.format(returner)](ret)
except Exception as exc:
pass
return ret
def print_docs(self):