Author: justi9 Date: 2008-12-12 11:19:59 -0500 (Fri, 12 Dec 2008) New Revision: 2990 Modified: mgmt/trunk/cumin/python/cumin/broker.py mgmt/trunk/cumin/python/cumin/queue.py mgmt/trunk/cumin/python/cumin/queue.strings Log: Ensure the links from the top-queues list include the broker in the context nav Modified: mgmt/trunk/cumin/python/cumin/broker.py =================================================================== --- mgmt/trunk/cumin/python/cumin/broker.py 2008-12-12 16:03:08 UTC (rev 2989) +++ mgmt/trunk/cumin/python/cumin/broker.py 2008-12-12 16:19:59 UTC (rev 2990) @@ -190,7 +190,7 @@ self.connections_close = ConnectionSetClose(app, "connsclose") self.add_mode(self.connections_close) - + class BrokerStatus(CuminStatus): def __init__(self, app, name): super(BrokerStatus, self).__init__(app, name) Modified: mgmt/trunk/cumin/python/cumin/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.py 2008-12-12 16:03:08 UTC (rev 2989) +++ mgmt/trunk/cumin/python/cumin/queue.py 2008-12-12 16:19:59 UTC (rev 2990) @@ -182,10 +182,15 @@ return "Name" def render_content(self, session, data): + reg = Identifiable(data["registration_id"]) queue = Identifiable(data["id"]) - href = self.page.main.broker.queue.get_href(session, queue) - return fmt_link(href, fmt_shorten(data["name"])) + branch = session.branch() + self.page.main.broker.object.set(session, reg) + self.page.main.broker.queue.object.set(session, queue) + self.page.main.broker.queue.show(session) + return fmt_link(branch.marshal(), fmt_shorten(data["name"])) + class EnqueuesColumn(TopTableColumn): def render_title(self, session, data): return "Recent Enqueues" Modified: mgmt/trunk/cumin/python/cumin/queue.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.strings 2008-12-12 16:03:08 UTC (rev 2989) +++ mgmt/trunk/cumin/python/cumin/queue.strings 2008-12-12 16:19:59 UTC (rev 2990) @@ -67,8 +67,11 @@ select q.id, q.name, + b.registration_id, (c.msg_total_enqueues - p.msg_total_enqueues) as enqueues from queue as q +join vhost as v on v.id = q.vhost_id +join broker as b on b.id = v.broker_id join queue_stats as c on c.id = q.stats_curr_id join queue_stats as p on p.id = q.stats_prev_id where p.qmf_update_time > now() - interval '60 seconds'