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

Merge pull request #22121 from tjstansell/fix-20841

Browse Source 
fix #20841: add sls name from reactor
This commit is contained in:
Thomas S Hatch 2015-03-30 10:27:42 -06:00
commit 36eca12cb9
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
salt/utils/event.py
View File

@ -602,10 +602,17 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
for fn_ in glob.glob(glob_ref):
try:
react.update(self.render_template(
res = self.render_template(
fn_,
tag=tag,
data=data))
data=data)
# for #20841, inject the sls name here since verify_high()
# assumes it exists in case there are any errors
for name in res:
res[name]['__sls__'] = fn_
react.update(res)
except Exception:
log.error('Failed to render "{0}"'.format(fn_))
return react
@ -656,15 +663,19 @@ class Reactor(multiprocessing.Process, salt.state.Compiler):
log.debug('Compiling reactions for tag {0}'.format(tag))
high = {}
chunks = []
for fn_ in reactors:
high.update(self.render_reaction(fn_, tag, data))
if high:
errors = self.verify_high(high)
if errors:
log.error(('Unable to render reactions for event {0} due to '
'errors ({1}) in one or more of the sls files ({2})').format(tag, errors, reactors))
return [] # We'll return nothing since there was an error
chunks = self.order_chunks(self.compile_high_data(high))
try:
for fn_ in reactors:
high.update(self.render_reaction(fn_, tag, data))
if high:
errors = self.verify_high(high)
if errors:
log.error(('Unable to render reactions for event {0} due to '
'errors ({1}) in one or more of the sls files ({2})').format(tag, errors, reactors))
return [] # We'll return nothing since there was an error
chunks = self.order_chunks(self.compile_high_data(high))
except Exception as exc:
log.error('Exception trying to compile reactions: {0}'.format(exc), exc_info=True)
return chunks
def call_reactions(self, chunks):