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

Merge pull request #11464 from terminalmage/minion-outputter

Browse Source 
Override __outputter__ when functions trigger exceptions
This commit is contained in:
Pedro Algarvio 2014-03-23 21:51:43 +00:00
commit dc051d7370
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/minion.py
View File

@ -845,6 +845,7 @@ class Minion(MinionBase):
)
log.debug(msg, exc_info=True)
ret['return'] = '{0}: {1}'.format(msg, exc)
ret['out'] = 'nested'
except CommandExecutionError as exc:
log.error(
'A command in {0!r} had a problem: {1}'.format(
@ -854,6 +855,7 @@ class Minion(MinionBase):
exc_info=log.isEnabledFor(logging.DEBUG)
)
ret['return'] = 'ERROR: {0}'.format(exc)
ret['out'] = 'nested'
except SaltInvocationError as exc:
log.error(
'Problem executing {0!r}: {1}'.format(
@ -865,6 +867,7 @@ class Minion(MinionBase):
ret['return'] = 'ERROR executing {0!r}: {1}'.format(
function_name, exc
)
ret['out'] = 'nested'
except TypeError as exc:
trb = traceback.format_exc()
aspec = salt.utils.get_function_argspec(
@ -877,12 +880,15 @@ class Minion(MinionBase):
aspec)
log.warning(msg, exc_info=log.isEnabledFor(logging.DEBUG))
ret['return'] = msg
ret['out'] = 'nested'
except Exception:
msg = 'The minion function caused an exception'
log.warning(msg, exc_info=log.isEnabledFor(logging.DEBUG))
ret['return'] = '{0}: {1}'.format(msg, traceback.format_exc())
ret['out'] = 'nested'
else:
ret['return'] = '{0!r} is not available.'.format(function_name)
ret['out'] = 'nested'
ret['jid'] = data['jid']
ret['fun'] = data['fun']
@ -986,13 +992,21 @@ class Minion(MinionBase):
'id': self.opts['id']}
for key, value in ret.items():
load[key] = value
try:
oput = self.functions[fun].__outputter__
except (KeyError, AttributeError, TypeError):
pass
if 'out' in ret:
if isinstance(ret['out'], string_types):
load['out'] = ret['out']
else:
log.error('Invalid outputter {0}. This is likely a bug.'
.format(ret['out']))
else:
if isinstance(oput, string_types):
load['out'] = oput
try:
oput = self.functions[fun].__outputter__
except (KeyError, AttributeError, TypeError):
pass
else:
if isinstance(oput, string_types):
load['out'] = oput
try:
ret_val = sreq.send('aes', self.crypticle.dumps(load))
except SaltReqTimeoutError: