development.ini | 1 +
moksha/hub/amqp/pyamqplib.py | 4 ++--
moksha/hub/amqp/qpid010.py | 2 +-
moksha/hub/hub.py | 5 ++++-
4 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 66056971ccd26c619630f33030706befd62b60e2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jan 7 17:03:41 2011 -0500
Pass some more AMQP broker configuration through to the pyamqplib layer
diff --git a/development.ini b/development.ini
index 7b938e8..0ff234a 100644
--- a/development.ini
+++ b/development.ini
@@ -105,6 +105,7 @@ stomp_pass = guest
#amqp_broker_port = 5672
#amqp_broker_user = guest
#amqp_broker_pass = guest
+#amqp_broker_ssl = False
# Documentation directory
docs_dir = docs
diff --git a/moksha/hub/amqp/pyamqplib.py b/moksha/hub/amqp/pyamqplib.py
index fc0f5e4..b9ab46c 100644
--- a/moksha/hub/amqp/pyamqplib.py
+++ b/moksha/hub/amqp/pyamqplib.py
@@ -29,8 +29,8 @@ NONPERSISTENT_DELIVERY = PERSISTENT_DELIVERY = range(1, 3)
class AMQPLibHub(BaseAMQPHub):
""" An AMQPHub implemention using the amqplib module
"""
- def __init__(self, broker, username=None, password=None, ssl=False):
- self.conn = amqp.Connection(host=broker, ssl=ssl,
+ def __init__(self, broker, username=None, password=None, ssl=False, threaded=False):
+ self.conn = amqp.Connection(host=broker, ssl=ssl, use_threading=threaded,
userid=username, password=password)
self.channel = self.conn.channel()
self.channel.access_request('/data', active=True, write=True, read=True)
diff --git a/moksha/hub/amqp/qpid010.py b/moksha/hub/amqp/qpid010.py
index 980c67e..0460420 100644
--- a/moksha/hub/amqp/qpid010.py
+++ b/moksha/hub/amqp/qpid010.py
@@ -35,7 +35,7 @@ class QpidAMQPHub(BaseAMQPHub):
"""
- def __init__(self, broker):
+ def __init__(self, broker, **kw):
self.set_broker(broker)
self.socket = connect(self.host, self.port)
if self.url.scheme == URL.AMQPS:
diff --git a/moksha/hub/hub.py b/moksha/hub/hub.py
index 819f098..5371474 100644
--- a/moksha/hub/hub.py
+++ b/moksha/hub/hub.py
@@ -72,7 +72,10 @@ class MokshaHub(StompHub, AMQPHub):
self.topics[topic].append(callback)
if self.amqp_broker:
- AMQPHub.__init__(self, self.amqp_broker)
+ AMQPHub.__init__(self, self.amqp_broker,
+ username=config.get('amqp_broker_user',
'guest'),
+ password=config.get('amqp_broker_pass',
'guest'),
+ ssl=config.get('amqp_broker_ssl', False))
if self.stomp_broker:
log.info('Initializing STOMP support')
Show replies by date