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

Update return data before calling returners

Browse Source
This commit is contained in:
Sebastian Sobczynski 2017-08-08 16:19:29 +01:00
parent 61fad97286
commit 1cc86592ed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/schedule.py
View File

@ -849,6 +849,12 @@ class Schedule(object):
ret['return'] = self.functions[func](*args, **kwargs) ret['return'] = self.functions[func](*args, **kwargs)
# runners do not provide retcode
if 'retcode' in self.functions.pack['__context__']:
ret['retcode'] = self.functions.pack['__context__']['retcode']
ret['success'] = True
data_returner = data.get('returner', None) data_returner = data.get('returner', None)
if data_returner or self.schedule_returner: if data_returner or self.schedule_returner:
if 'return_config' in data: if 'return_config' in data:
@ -865,7 +871,6 @@ class Schedule(object):
for returner in OrderedDict.fromkeys(rets): for returner in OrderedDict.fromkeys(rets):
ret_str = '{0}.returner'.format(returner) ret_str = '{0}.returner'.format(returner)
if ret_str in self.returners: if ret_str in self.returners:
ret['success'] = True
self.returners[ret_str](ret) self.returners[ret_str](ret)
else: else:
log.info( log.info(
@ -874,11 +879,6 @@ class Schedule(object):
) )
) )
# runners do not provide retcode
if 'retcode' in self.functions.pack['__context__']:
ret['retcode'] = self.functions.pack['__context__']['retcode']
ret['success'] = True
except Exception: except Exception:
log.exception("Unhandled exception running {0}".format(ret['fun'])) log.exception("Unhandled exception running {0}".format(ret['fun']))
# Although catch-all exception handlers are bad, the exception here # Although catch-all exception handlers are bad, the exception here