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

Add wheel function events, fix #7040

Browse Source
This commit is contained in:
Thomas S Hatch 2013-09-05 22:15:14 -06:00
parent 1acec08785
commit 39af7d153c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/master.py
View File

@ -1761,9 +1761,9 @@ class ClearFuncs(object):
def runner(self, clear_load): def runner(self, clear_load):
''' '''
Send a master control function back to the wheel system Send a master control function back to the runner system
''' '''
# All wheel ops pass through eauth # All runner ops pass through eauth
if 'token' in clear_load: if 'token' in clear_load:
try: try:
token = self.loadauth.get_tok(clear_load['token']) token = self.loadauth.get_tok(clear_load['token'])
@ -1925,7 +1925,14 @@ class ClearFuncs(object):
try: try:
fun = clear_load.pop('fun') fun = clear_load.pop('fun')
return self.wheel_.call_func(fun, **clear_load.get('kwarg', {})) new_data = {'fun': clear_load['fun'],
'user': clear_load.get('username', 'UNKNOWN')}
jid = salt.utils.gen_jid()
self.event.fire_event(new_data, tagify([jid, 'new'], 'wheel'))
ret = self.wheel_.call_func(fun, **clear_load.get('kwarg', {}))
ret_data = {'ret': ret,
'user': clear_load.get('username', 'UNKNOWN')}
self.event.fire_event(ret_data, tagify([jid, 'ret'], 'wheel'))
except Exception as exc: except Exception as exc:
log.error('Exception occurred while ' log.error('Exception occurred while '
'introspecting {0}: {1}'.format(fun, exc)) 'introspecting {0}: {1}'.format(fun, exc))