summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-07-30 14:30:02 +0100
committerAsk Solem <ask@celeryproject.org>2012-07-30 14:30:02 +0100
commit5456a6bbeb4a1463c3ff4be9ab6e0e548c6b055a (patch)
treecc237e5abbc9965c991488dde8c0614ca46d6f57
parentdd2fa4f243239459bb63c9c28cd89ff779d3f9b3 (diff)
downloadkombu-5456a6bbeb4a1463c3ff4be9ab6e0e548c6b055a.tar.gz
flakes
-rw-r--r--kombu/transport/zmq.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/kombu/transport/zmq.py b/kombu/transport/zmq.py
index 0e532931..afd25462 100644
--- a/kombu/transport/zmq.py
+++ b/kombu/transport/zmq.py
@@ -79,7 +79,8 @@ class MultiChannelPoller(object):
class Client(object):
- def __init__(self, uri='tcp://127.0.0.1', port=DEFAULT_PORT, hwm=DEFAULT_HWM, swap_size=None, enable_sink=True, context=None):
+ def __init__(self, uri='tcp://127.0.0.1', port=DEFAULT_PORT,
+ hwm=DEFAULT_HWM, swap_size=None, enable_sink=True, context=None):
try:
scheme, parts = uri.split('://')
except ValueError:
@@ -179,7 +180,7 @@ class Channel(virtual.Channel):
return 0
def _poll(self, cycle, timeout=None):
- return cycle.get(timeout=timeout)
+ return cycle.get(timeout=timeout)
def close(self):
if not self.closed:
@@ -190,10 +191,14 @@ class Channel(virtual.Channel):
pass
super(Channel, self).close()
+ def _prepare_port(self, port):
+ return (port + self.channel_id - 1) * self.port_incr
+
def _create_client(self):
conninfo = self.connection.client
+ port = self._prepare_port(conninfo.port or DEFAULT_PORT)
return self.Client(uri=conninfo.hostname or 'tcp://127.0.0.1',
- port=(conninfo.port or DEFAULT_PORT) + ((self.channel_id - 1) * self.port_incr),
+ port=port,
hwm=self.hwm,
swap_size=self.swap_size,
enable_sink=self.enable_sink,