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 #37502 from cachedout/issue_37444

Browse Source 
Log proper message on returners that cannot be loaded
This commit is contained in:
Mike Place 2016-11-07 22:32:45 +13:00 committed by GitHub
commit 4b6f1ab1c4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/minion.py
View File

@ -1458,9 +1458,13 @@ class Minion(MinionBase):
ret['id'] = opts['id'] ret['id'] = opts['id']
for returner in set(data['ret'].split(',')): for returner in set(data['ret'].split(',')):
try: try:
minion_instance.returners['{0}.returner'.format( returner_str = '{0}.returner'.format(returner)
returner if returner_str in minion_instance.returners:
)](ret) minion_instance.returners[returner_str](ret)
else:
returner_err = minion_instance.returners.missing_fun_string(returner_str)
log.error('Returner {0} could not be loaded: {1}'.format(
returner_str, returner_err))
except Exception as exc: except Exception as exc:
log.error( log.error(
'The return failed for job {0} {1}'.format( 'The return failed for job {0} {1}'.format(