diff options
| author | Ask Solem <ask@celeryproject.org> | 2012-01-10 15:44:34 +0000 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2012-01-10 15:46:47 +0000 |
| commit | a276e1d8829468ae1c5161aace36d3c78ff649c9 (patch) | |
| tree | 10d70c936cdf5265660cf96f379ca7bf1f6de7ca | |
| parent | ccf9563d2468d399c8f69b8282535ead99d46ce3 (diff) | |
| download | kombu-1.0-archived.tar.gz | |
eventio poll timeout should be in seconds. Closes #861.0-archived
| -rw-r--r-- | kombu/transport/pyredis.py | 2 | ||||
| -rw-r--r-- | kombu/utils/eventio.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/kombu/transport/pyredis.py b/kombu/transport/pyredis.py index da6f8e17..bba3a737 100644 --- a/kombu/transport/pyredis.py +++ b/kombu/transport/pyredis.py @@ -108,7 +108,7 @@ class MultiChannelPoller(object): if channel.active_fanout_queues: # LISTEN mode? self._register_LISTEN(channel) - events = self._poller.poll(timeout and timeout * 1000 or None) + events = self._poller.poll(timeout) for fileno, event in events: if event & eventio.POLL_READ: chan, type = self._fd_to_chan[fileno] diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py index 87b3ec2b..e2241b00 100644 --- a/kombu/utils/eventio.py +++ b/kombu/utils/eventio.py @@ -59,7 +59,7 @@ class _epoll(Poller): pass def _poll(self, timeout): - return self._epoll.poll(timeout and timeout / 1000.0 or -1) + return self._epoll.poll(timeout or -1) class _kqueue(Poller): @@ -84,8 +84,7 @@ class _kqueue(Poller): flags=flags)], 0) def _poll(self, timeout): - kevents = self._kqueue.control(None, 1000, - timeout and timeout / 1000.0 or timeout) + kevents = self._kqueue.control(None, 1000, timeout) events = {} for kevent in kevents: fd = kevent.ident |