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

Fix exception casting bug, pass id to dynamic returners

Browse Source
This commit is contained in:
Thomas S Hatch 2011-04-18 22:57:14 -06:00
parent cf7b0e8499
commit 149c7fae92
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/minion.py
View File

@ -283,11 +283,12 @@ class Minion(object):
ret['return'] = exc ret['return'] = exc
ret['jid'] = data['jid'] ret['jid'] = data['jid']
if data['ret']: if data['ret']:
ret['id'] = self.opts['id']
try: try:
self.returners[data['ret']](ret) self.returners[data['ret']](ret)
except Exception as exc: except Exception as exc:
self.opts['logger'].error('The return failed for job'\ self.opts['logger'].error('The return failed for job'\
+ data['jid'] + ' ' + exc) + data['jid'] + ' ' + str(exc))
else: else:
self._return_pub(ret) self._return_pub(ret)
@ -313,11 +314,12 @@ class Minion(object):
ret['return'][data['fun'][ind]] = exc ret['return'][data['fun'][ind]] = exc
ret['jid'] = data['jid'] ret['jid'] = data['jid']
if data['ret']: if data['ret']:
ret['id'] = self.opts['id']
try: try:
self.returners[data['ret']](ret) self.returners[data['ret']](ret)
except Exception as exc: except Exception as exc:
self.opts['logger'].error('The return failed for job'\ self.opts['logger'].error('The return failed for job'\
+ data['jid'] + ' ' + exc) + data['jid'] + ' ' + str(exc))
else: else:
self._return_pub(ret) self._return_pub(ret)