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

Update wheen return api for consistency

Browse Source
This commit is contained in:
Thomas S Hatch 2013-11-25 16:25:21 -07:00
parent 822113fa6c
commit 99e0d89b6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/master.py
View File

@ -2139,20 +2139,20 @@ class ClearFuncs(object):
try:
self.event.fire_event(data, tagify([jid, 'new'], 'wheel'))
ret = self.wheel_.call_func(fun, **clear_load.get('kwarg', {}))
data['ret'] = ret
data['return'] = ret
data['success'] = True
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return tag
return {'tag': tag}
except Exception as exc:
log.error(exc)
log.error('Exception occurred while '
'introspecting {0}: {1}'.format(fun, exc))
data['ret'] = 'Exception occured in wheel {0}: {1}'.format(
data['return'] = 'Exception occured in wheel {0}: {1}'.format(
fun,
exc,
)
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return tag
return {'tag': tag}
if 'eauth' not in clear_load:
msg = ('Authentication failure of type "eauth" occurred for '
@ -2200,19 +2200,19 @@ class ClearFuncs(object):
try:
self.event.fire_event(data, tagify([jid, 'new'], 'wheel'))
ret = self.wheel_.call_func(fun, **clear_load.get('kwarg', {}))
data['ret'] = ret
data['return'] = ret
data['success'] = True
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return tag
return {'tag': tag}
except Exception as exc:
log.error('Exception occurred while '
'introspecting {0}: {1}'.format(fun, exc))
data['ret'] = 'Exception occured in wheel {0}: {1}'.format(
data['return'] = 'Exception occured in wheel {0}: {1}'.format(
fun,
exc,
)
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return tag
return {'tag': tag}
except Exception as exc:
log.error(