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

Only format() once. Don't create the debug message, just log it.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-04-22 20:39:31 +01:00
parent 1f7a1aed70
commit c1298fc6e3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/minion.py
View File

@ -447,11 +447,15 @@ class Minion(object):
)
except TypeError as exc:
aspec = _getargs(minion_instance.functions[data['fun']])
msg = 'Missing arguments executing "{0}": {1}'
log.warning(msg.format(function_name, aspec))
dmsg = '"Missing args" caused by exc: {0}'.format(exc)
log.debug(dmsg, exc_info=True)
ret['return'] = msg.format(function_name, aspec)
msg = 'Missing arguments executing "{0}": {1}'.format(
function_name, aspec
)
log.warning(msg)
log.debug(
'"Missing args" caused by exc: {0}'.format(exc),
exc_info=True
)
ret['return'] = msg
except Exception:
trb = traceback.format_exc()
msg = 'The minion function caused an exception: {0}'