moksha/api/hub/consumer.py | 4 ++--
moksha/hub/amqp/pyamqplib.py | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 92145193e14be58e8d36b19a4cbacc065d0cd8c9
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Jan 12 17:39:35 2011 -0500
Some method renaming in our AMQP stack to prevent conflicts with STOMP
diff --git a/moksha/api/hub/consumer.py b/moksha/api/hub/consumer.py
index 1c5712c..0d24094 100644
--- a/moksha/api/hub/consumer.py
+++ b/moksha/api/hub/consumer.py
@@ -54,9 +54,9 @@ class Consumer(object):
self.hub.queue_declare(queue=queue_name, exclusive=True)
self.hub.exchange_bind(queue_name, binding_key=topic)
if self.jsonify:
- self.hub.subscribe(queue_name, self._consume_json)
+ self.hub.queue_subscribe(queue_name, self._consume_json)
else:
- self.hub.subscribe(queue_name, self._consume)
+ self.hub.queue_subscribe(queue_name, self._consume)
else:
# Assume we're using Qpid then.
server_queue_name = 'moksha_consumer_' +
self.hub.session.name
diff --git a/moksha/hub/amqp/pyamqplib.py b/moksha/hub/amqp/pyamqplib.py
index e6a031f..32c1f31 100644
--- a/moksha/hub/amqp/pyamqplib.py
+++ b/moksha/hub/amqp/pyamqplib.py
@@ -77,13 +77,12 @@ class AMQPLibHub(BaseAMQPHub):
msg = self.channel.basic_get(queue, no_ack=True)
return msg
- def subscribe(self, queue, callback, no_ack=True):
+ def queue_subscribe(self, queue, callback, no_ack=True):
"""
Consume messages from a given `queue`, passing each to `callback`
"""
self.channel.basic_consume(queue, callback=callback, no_ack=no_ack)
-
def wait(self):
self.channel.wait()
Show replies by date