valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't close the pub_channel because it's being returned in the function

Browse Source
This commit is contained in:
Pedro Algarvio 2018-12-28 19:11:58 +00:00
parent f479fdcf4d
commit e494902944
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/minion.py
View File

@ -697,7 +697,6 @@ class MinionBase(object):
)
opts.update(prep_ip_port(opts))
opts.update(resolve_dns(opts))
pub_channel = None
try:
if self.opts['transport'] == 'detect':
self.opts['detect_mode'] = True
@ -722,9 +721,6 @@ class MinionBase(object):
# Exhausted all attempts. Return exception.
self.connected = False
raise exc
finally:
if pub_channel is not None:
pub_channel.close()
def _discover_masters(self):
'''
@ -1006,10 +1002,8 @@ class MinionManager(MinionBase):
False,
io_loop=self.io_loop,
loaded_base_name='salt.loader.{0}'.format(s_opts['master']),
jid_queue=self.jid_queue,
)
self._connect_minion(minion)
jid_queue=self.jid_queue)
self.io_loop.spawn_callback(self._connect_minion, minion)
self.io_loop.call_later(timeout, self._check_minions)
@tornado.gen.coroutine