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

Remove obsolete ZMQIOLoop direct instance

Browse source
This commit is contained in:
Bo Maryniuk 2018-02-15 10:02:22 +01:00
parent 1c90cbdb3c
commit 834b1e4ff0
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/minion.py
View file

@ -645,10 +645,7 @@ class SMinion(MinionBase):
# Clean out the proc directory (default /var/cache/salt/minion/proc)
if (self.opts.get('file_client', 'remote') == 'remote'
or self.opts.get('use_master_when_local', False)):
if self.opts['transport'] == 'zeromq' and zmq and not tornado.version_info >= (5,):
io_loop = zmq.eventloop.ioloop.ZMQIOLoop()
else:
io_loop = ZMQDefaultLoop.current()
io_loop = ZMQDefaultLoop.current()
io_loop.run_sync(
lambda: self.eval_master(self.opts, failed=True)
)