saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35059 from vutny/event-function-args

Browse source 
Add `fun_args` field to events generated by execution of Master modules
This commit is contained in:
Mike Place 2016-08-01 07:01:42 -06:00 • committed by GitHub
commit 1f8a0fd1e7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/client/mixins.py
View file

@ -256,10 +256,14 @@ class SyncClientMixin(object):
jid = low.get('__jid__', salt.utils.jid.gen_jid())
tag = low.get('__tag__', tagify(jid, prefix=self.tag_prefix))
# This avoids including kwargs dict as args list in low data.
# We only need to update event data.
fun_args = low.get('args', [])
data = {'fun': '{0}.{1}'.format(self.client, fun),
'fun_args': fun_args + ([low['kwargs']] if low.get('kwargs', False) else []),
'jid': jid,
'user': low.get('__user__', 'UNKNOWN'),
}
}
event = salt.utils.event.get_event(
'master',