mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
parent
2422dafd52
commit
17d01e4f4c
2 changed files with 8 additions and 4 deletions
|
@ -1458,9 +1458,13 @@ class Minion(MinionBase):
|
|||
ret['id'] = opts['id']
|
||||
for returner in set(data['ret'].split(',')):
|
||||
try:
|
||||
minion_instance.returners['{0}.returner'.format(
|
||||
returner
|
||||
)](ret)
|
||||
returner_str = '{0}.returner'.format(returner)
|
||||
if returner_str in minion_instance.returners:
|
||||
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:
|
||||
log.error(
|
||||
'The return failed for job {0} {1}'.format(
|
||||
|
|
|
@ -105,7 +105,7 @@ __virtualname__ = 'carbon'
|
|||
|
||||
|
||||
def __virtual__():
|
||||
return __virtualname__
|
||||
return (False, 'Testing #37444')
|
||||
|
||||
|
||||
def _get_options(ret):
|
||||
|
|
Loading…
Add table
Reference in a new issue