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

Lintfix: line too long

Browse Source
This commit is contained in:
Bo Maryniuk 2018-02-14 10:14:45 +01:00
parent 4e650c0b44
commit 1ece6a5f52
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/transport/zeromq.py
View File

@ -129,7 +129,8 @@ class AsyncZeroMQReqChannel(salt.transport.client.ReqChannel):
obj = object.__new__(cls) obj = object.__new__(cls)
obj.__singleton_init__(opts, **kwargs) obj.__singleton_init__(opts, **kwargs)
loop_instance_map[key] = obj loop_instance_map[key] = obj
log.trace('Inserted key into loop_instance_map id {0} for key {1} and process {2}'.format(id(loop_instance_map), key, os.getpid())) log.trace('Inserted key into loop_instance_map id %s for key %s and process %s',
id(loop_instance_map), key, os.getpid())
else: else:
log.debug('Re-using AsyncZeroMQReqChannel for {0}'.format(key)) log.debug('Re-using AsyncZeroMQReqChannel for {0}'.format(key))
return obj return obj
@ -476,7 +477,8 @@ class AsyncZeroMQPubChannel(salt.transport.mixins.auth.AESPubClientMixin, salt.t
return self.stream.on_recv(wrap_callback) return self.stream.on_recv(wrap_callback)
class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.transport.server.ReqServerChannel): class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin,
salt.transport.server.ReqServerChannel):
def __init__(self, opts): def __init__(self, opts):
salt.transport.server.ReqServerChannel.__init__(self, opts) salt.transport.server.ReqServerChannel.__init__(self, opts)
@ -497,7 +499,8 @@ class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.
self.clients.setsockopt(zmq.IPV4ONLY, 0) self.clients.setsockopt(zmq.IPV4ONLY, 0)
self.clients.setsockopt(zmq.BACKLOG, self.opts.get('zmq_backlog', 1000)) self.clients.setsockopt(zmq.BACKLOG, self.opts.get('zmq_backlog', 1000))
if HAS_ZMQ_MONITOR and self.opts['zmq_monitor']: if HAS_ZMQ_MONITOR and self.opts['zmq_monitor']:
# Socket monitor shall be used the only for debug purposes so using threading doesn't look too bad here # Socket monitor shall be used the only for debug
# purposes so using threading doesn't look too bad here
import threading import threading
self._monitor = ZeroMQSocketMonitor(self.clients) self._monitor = ZeroMQSocketMonitor(self.clients)
t = threading.Thread(target=self._monitor.start_poll) t = threading.Thread(target=self._monitor.start_poll)
@ -580,7 +583,8 @@ class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.
self.context = zmq.Context(1) self.context = zmq.Context(1)
self._socket = self.context.socket(zmq.REP) self._socket = self.context.socket(zmq.REP)
if HAS_ZMQ_MONITOR and self.opts['zmq_monitor']: if HAS_ZMQ_MONITOR and self.opts['zmq_monitor']:
# Socket monitor shall be used the only for debug purposes so using threading doesn't look too bad here # Socket monitor shall be used the only for debug
# purposes so using threading doesn't look too bad here
import threading import threading
self._w_monitor = ZeroMQSocketMonitor(self._socket) self._w_monitor = ZeroMQSocketMonitor(self._socket)
t = threading.Thread(target=self._w_monitor.start_poll) t = threading.Thread(target=self._w_monitor.start_poll)