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

Merge pull request #30815 from vutny/reactor-low-data-fix

Browse Source 
Pick right user argument for updating reactor function's low data
This commit is contained in:
Mike Place 2016-02-02 09:50:22 -07:00
commit 3cb7a9ee54
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/reactor.py
View File

@ -181,7 +181,7 @@ class ReactWrap(object):
def run(self, low): def run(self, low):
''' '''
Execute the specified function in the specified state by passing the Execute the specified function in the specified state by passing the
LowData low data
''' '''
l_fun = getattr(self, low['state']) l_fun = getattr(self, low['state'])
try: try:
@ -190,9 +190,9 @@ class ReactWrap(object):
# TODO: Setting the user doesn't seem to work for actual remote publishes # TODO: Setting the user doesn't seem to work for actual remote publishes
if low['state'] in ('runner', 'wheel'): if low['state'] in ('runner', 'wheel'):
# TODO: pick one... # Update called function's low data with event user to
# segregate events fired by reactor and avoid reaction loops
kwargs['__user__'] = self.event_user kwargs['__user__'] = self.event_user
kwargs['user'] = self.event_user
l_fun(*f_call.get('args', ()), **kwargs) l_fun(*f_call.get('args', ()), **kwargs)
except Exception: except Exception: