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

Add return data to the wheel return seq

Browse Source
This commit is contained in:
Thomas S Hatch 2013-12-12 10:43:30 -07:00
parent a9bcf2ca67
commit 8f4915a5d3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/master.py
View File

@ -2197,7 +2197,8 @@ class ClearFuncs(object):
data['return'] = ret data['return'] = ret
data['success'] = True data['success'] = True
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel')) self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return {'tag': tag} return {'tag': tag,
'data': data}
except Exception as exc: except Exception as exc:
log.error(exc) log.error(exc)
log.error('Exception occurred while ' log.error('Exception occurred while '
@ -2209,7 +2210,8 @@ class ClearFuncs(object):
) )
data['success'] = False data['success'] = False
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel')) self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return {'tag': tag} return {'tag': tag,
'data': data}
if 'eauth' not in clear_load: if 'eauth' not in clear_load:
msg = ('Authentication failure of type "eauth" occurred for ' msg = ('Authentication failure of type "eauth" occurred for '
@ -2265,7 +2267,8 @@ class ClearFuncs(object):
data['return'] = ret data['return'] = ret
data['success'] = True data['success'] = True
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel')) self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return {'tag': tag} return {'tag': tag,
'data': data}
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))
@ -2275,7 +2278,8 @@ class ClearFuncs(object):
exc, exc,
) )
self.event.fire_event(data, tagify([jid, 'ret'], 'wheel')) self.event.fire_event(data, tagify([jid, 'ret'], 'wheel'))
return {'tag': tag} return {'tag': tag,
'data': data}
except Exception as exc: except Exception as exc:
log.error( log.error(