Author: justi9 Date: 2008-12-11 14:33:36 -0500 (Thu, 11 Dec 2008) New Revision: 2981 Modified: mgmt/trunk/cumin/python/cumin/queue.py mgmt/trunk/cumin/python/cumin/queue.strings Log: Switch to a simpler method of counting recent enqueues Modified: mgmt/trunk/cumin/python/cumin/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.py 2008-12-11 18:52:13 UTC (rev 2980) +++ mgmt/trunk/cumin/python/cumin/queue.py 2008-12-11 19:33:36 UTC (rev 2981) @@ -190,9 +190,6 @@ def render_title(self, session, data): return "Recent Enqueues" - def render_content(self, session, data): - return int(data["avg_enqueues"]) - class QueueFrame(CuminFrame): def __init__(self, app, name): super(QueueFrame, self).__init__(app, name) Modified: mgmt/trunk/cumin/python/cumin/queue.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.strings 2008-12-11 18:52:13 UTC (rev 2980) +++ mgmt/trunk/cumin/python/cumin/queue.strings 2008-12-11 19:33:36 UTC (rev 2981) @@ -67,12 +67,12 @@ select q.id, q.name, - avg(s.msg_total_enqueues) as avg_enqueues + (c.msg_total_enqueues - p.msg_total_enqueues) as enqueues from queue as q -join queue_stats as s on s.queue_id = q.id -where s.qmf_update_time > now() - interval '10 minutes' -group by q.id, q.name -order by avg_enqueues desc +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' +order by enqueues desc limit 5 [TopQueueSet.count_sql]