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 #36024 from DSRCorporation/bugs/31454_local_client_memleak

Browse source 
Don't subscribe to events if not sure it would read them.
This commit is contained in:
Mike Place 2016-09-03 00:41:01 +09:00 • committed by GitHub
commit cd60ec5d57
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/client/__init__.py
View file

@ -1493,10 +1493,6 @@ class LocalClient(object):
master_uri=master_uri)
try:
# Ensure that the event subscriber is connected.
# If not, we won't get a response, so error out
if not self.event.connect_pub(timeout=timeout):
raise SaltReqTimeoutError()
payload = channel.send(payload_kwargs, timeout=timeout)
except SaltReqTimeoutError:
raise SaltReqTimeoutError(