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

misc cleanup

Browse Source
This commit is contained in:
Thomas Jackson 2015-03-20 09:01:18 -07:00
parent 6ab5da87c4
commit bdbf6a33d2
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/minion.py
View File

@ -553,10 +553,7 @@ class Minion(MinionBase):
self.win_proc = []
self.loaded_base_name = loaded_base_name
if io_loop is None:
self.io_loop = zmq.eventloop.ioloop.ZMQIOLoop()
else:
self.io_loop = io_loop
self.io_loop = io_loop or zmq.eventloop.ioloop.ZMQIOLoop()
if not self.io_loop.initialized():
self.io_loop.install()

5
salt/transport/tcp.py
View File

@ -190,9 +190,6 @@ class TCPReqChannel(salt.transport.client.ReqChannel):
class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
'''
Encapsulate sending routines to tcp.
TODO:
- add timeouts
'''
def __init__(self, opts, **kwargs):
self.opts = dict(opts)
@ -299,7 +296,7 @@ class TCPPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.transport
callback(self._decode_payload(self.serial.loads(body)))
return self.message_client.on_recv(wrap_callback)
# TODO: switch everything to this
# TODO: switch everything to this?
class AsyncTCPPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.transport.client.PubChannel):
def __init__(self,
opts,