Branch 'dev' - moksha/templates
by Luke Macken
moksha/templates/widget.mak | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 18e2816e33d45b30b118b8185d7a5c179398c12f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon May 23 01:53:36 2011 -0400
Call the TW1/TW2 display() method if it exists on the widget first
diff --git a/moksha/templates/widget.mak b/moksha/templates/widget.mak
index 0203691..f329070 100644
--- a/moksha/templates/widget.mak
+++ b/moksha/templates/widget.mak
@@ -1,6 +1,12 @@
<html>
<head></head>
- <body>${tmpl_context.widget.display(**options)}</body>
+ <body>
+ % if hasattr(tmpl_context.widget, 'display'):
+ ${tmpl_context.widget.display(**options)}
+ % else:
+ ${tmpl_context.widget(**options)}
+ % endif
+ </body>
% if hasattr(tmpl_context, 'moksha_socket') and not isinstance(tmpl_context.moksha_socket, basestring) :
${tmpl_context.moksha_socket.display()}
13 years
Branch 'dev' - moksha/api moksha/templates
by Luke Macken
moksha/api/widgets/amqp/amqp.py | 6 ++++--
moksha/templates/amqp_socket.mak | 7 +++++--
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 342b220751f78235d435804e18cdfb5dec9d5276
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 5 01:04:11 2011 -0400
Declare our live socket AMQP queues as being exclusive
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py
index f039757..def4e3b 100644
--- a/moksha/api/widgets/amqp/amqp.py
+++ b/moksha/api/widgets/amqp/amqp.py
@@ -142,11 +142,13 @@ class AMQPSocket(Widget):
moksha_amqp_session.Queue('declare', {
queue: moksha_amqp_remote_queue,
- auto_delete: true
+ auto_delete: true,
+ exclusive: true
});
moksha_amqp_queue = moksha_amqp_session.create_local_queue({
name: 'local_queue',
- auto_delete: true
+ auto_delete: true,
+ exclusive: true
});
% if onconnectedframe:
diff --git a/moksha/templates/amqp_socket.mak b/moksha/templates/amqp_socket.mak
index 4873bce..4cd615d 100644
--- a/moksha/templates/amqp_socket.mak
+++ b/moksha/templates/amqp_socket.mak
@@ -77,10 +77,13 @@ if (typeof moksha_amqp_conn == 'undefined') {
moksha_amqp_session.Queue('declare', {
queue: moksha_amqp_remote_queue,
- auto_delete: true
+ auto_delete: true,
+ exclusive: true
});
moksha_amqp_queue = moksha_amqp_session.create_local_queue({
- name: 'local_queue'
+ name: 'local_queue',
+ auto_delete: true,
+ exclusive: true
});
moksha_amqp_queue.subscribe({
13 years
Branch 'dev' - moksha/api
by Luke Macken
moksha/api/widgets/amqp/amqp.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit da50b64cd8910e651559df770f99e500c5864275
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 5 00:52:58 2011 -0400
auto-delete our local amqp queue
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py
index 4c79bd4..f039757 100644
--- a/moksha/api/widgets/amqp/amqp.py
+++ b/moksha/api/widgets/amqp/amqp.py
@@ -145,7 +145,8 @@ class AMQPSocket(Widget):
auto_delete: true
});
moksha_amqp_queue = moksha_amqp_session.create_local_queue({
- name: 'local_queue'
+ name: 'local_queue',
+ auto_delete: true
});
% if onconnectedframe:
13 years
Branch 'dev' - moksha/api moksha/hub moksha/templates
by Luke Macken
moksha/api/hub/consumer.py | 6 ++++--
moksha/api/widgets/amqp/amqp.py | 3 ++-
moksha/hub/hub.py | 3 ++-
moksha/templates/amqp_socket.mak | 3 ++-
4 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 4b7c4495c1d5bebce4f7482a9bf355273db03357
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 5 00:40:47 2011 -0400
Declare auto-deleting AMQP queues
diff --git a/moksha/api/hub/consumer.py b/moksha/api/hub/consumer.py
index 0d24094..e566cdf 100644
--- a/moksha/api/hub/consumer.py
+++ b/moksha/api/hub/consumer.py
@@ -51,7 +51,8 @@ class Consumer(object):
if isinstance(self.hub, AMQPLibHub):
# AMQPLibHub specific
queue_name = str(uuid.uuid4())
- self.hub.queue_declare(queue=queue_name, exclusive=True)
+ self.hub.queue_declare(queue=queue_name, exclusive=True,
+ auto_delete=True)
self.hub.exchange_bind(queue_name, binding_key=topic)
if self.jsonify:
self.hub.queue_subscribe(queue_name, self._consume_json)
@@ -60,7 +61,8 @@ class Consumer(object):
else:
# Assume we're using Qpid then.
server_queue_name = 'moksha_consumer_' + self.hub.session.name
- self.hub.queue_declare(queue=server_queue_name, exclusive=True)
+ self.hub.queue_declare(queue=server_queue_name, exclusive=True,
+ auto_delete=True)
self.hub.exchange_bind(server_queue_name, binding_key=topic)
local_queue_name = 'moksha_consumer_' + self.hub.session.name
self.hub.local_queue = self.hub.session.incoming(local_queue_name)
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py
index 750f336..4c79bd4 100644
--- a/moksha/api/widgets/amqp/amqp.py
+++ b/moksha/api/widgets/amqp/amqp.py
@@ -141,7 +141,8 @@ class AMQPSocket(Widget):
moksha_amqp_session.name;
moksha_amqp_session.Queue('declare', {
- queue: moksha_amqp_remote_queue
+ queue: moksha_amqp_remote_queue,
+ auto_delete: true
});
moksha_amqp_queue = moksha_amqp_session.create_local_queue({
name: 'local_queue'
diff --git a/moksha/hub/hub.py b/moksha/hub/hub.py
index 219abc1..16a7d38 100644
--- a/moksha/hub/hub.py
+++ b/moksha/hub/hub.py
@@ -180,7 +180,8 @@ class CentralMokshaHub(MokshaHub):
if self.stomp_broker:
log.debug("Initializing local AMQP queue...")
self.server_queue_name = 'moksha_hub_' + self.session.name
- self.queue_declare(queue=self.server_queue_name, exclusive=True)
+ self.queue_declare(queue=self.server_queue_name,
+ exclusive=True, auto_delete=True)
self.exchange_bind(self.server_queue_name, binding_key='#')
self.local_queue_name = 'moksha_hub'
self.local_queue = self.session.incoming(self.local_queue_name)
diff --git a/moksha/templates/amqp_socket.mak b/moksha/templates/amqp_socket.mak
index 00a73fc..4873bce 100644
--- a/moksha/templates/amqp_socket.mak
+++ b/moksha/templates/amqp_socket.mak
@@ -76,7 +76,8 @@ if (typeof moksha_amqp_conn == 'undefined') {
moksha_amqp_session.name;
moksha_amqp_session.Queue('declare', {
- queue: moksha_amqp_remote_queue
+ queue: moksha_amqp_remote_queue,
+ auto_delete: true
});
moksha_amqp_queue = moksha_amqp_session.create_local_queue({
name: 'local_queue'
13 years