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

remove old event that never got ran

Browse Source
This commit is contained in:
Daniel Wallace 2017-11-17 13:28:53 -07:00
parent 7d55924cf1
commit d3a556a6f3
No known key found for this signature in database
GPG Key ID: 5FA5E5544F010D48
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
salt/client/ssh/__init__.py
View File

@ -662,21 +662,12 @@ class SSH(object):
host = next(six.iterkeys(ret))
self.cache_job(jid, host, ret[host], fun)
if self.event:
jobid = jid
_, data = next(six.iteritems(ret))
self.event.fire_event(
ret,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
for _, data in six.iteritems(ret):
if not isinstance(data, dict):
continue
data['jid'] = jobid
self.event.fire_event(
data,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
data,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
yield ret
def cache_job(self, jid, id_, ret, fun):
@ -781,21 +772,12 @@ class SSH(object):
outputter,
self.opts)
if self.event:
jobid = jid
_, data = next(six.iteritems(ret))
self.event.fire_event(
ret,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
for _, data in six.iteritems(ret):
if not isinstance(data, dict):
continue
data['jid'] = jobid
self.event.fire_event(
data,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
data,
salt.utils.event.tagify(
[jid, 'ret', host],
'job'))
if self.opts.get('static'):
salt.output.display_output(
sret,