From 239792009848e8cf8582cc27ba6c41b42c09b0d5 Mon Sep 17 00:00:00 2001
From: Marko Kreen
Date: Tue, 3 Nov 2009 14:37:37 +0200
Subject: pgqadm status: show quick stats

---
 python/pgq/status.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'python/pgq/status.py')

diff --git a/python/pgq/status.py b/python/pgq/status.py
index 7a434e3e..eb6bc6be 100644
--- a/python/pgq/status.py
+++ b/python/pgq/status.py
@@ -34,7 +34,8 @@ class PGQStatus(skytools.DBScript):
         print("Postgres version: %s   PgQ version: %s" % (pgver, qver))
 
         q = """select f.queue_name, f.queue_ntables, %s, %s,
-                      %s, %s, q.queue_ticker_max_count
+                      %s, %s, q.queue_ticker_max_count,
+                      f.ev_per_sec, f.ev_new
                 from pgq.get_queue_info() f, pgq.queue q
                where q.queue_name = f.queue_name""" % (
                     ival('f.queue_rotation_period'),
@@ -45,7 +46,7 @@ class PGQStatus(skytools.DBScript):
         cx.execute(q)
         event_rows = cx.dictfetchall()
 
-        q = """select queue_name, consumer_name, %s, %s
+        q = """select queue_name, consumer_name, %s, %s, pending_events
                from pgq.get_consumer_info()""" % (
                 ival('lag'),
                 ival('last_seen'),
@@ -53,23 +54,25 @@ class PGQStatus(skytools.DBScript):
         cx.execute(q)
         consumer_rows = cx.dictfetchall()
 
-        print("\n%-45s %9s %13s %6s" % ('Event queue',
-                            'Rotation', 'Ticker', 'TLag'))
+        print("\n%-33s %9s %13s %6s %6s %5s" % ('Event queue',
+                            'Rotation', 'Ticker', 'TLag', 'EPS', 'New'))
         print('-' * 78)
         for ev_row in event_rows:
             tck = "%s/%s/%s" % (ev_row['queue_ticker_max_count'],
                     ev_row['queue_ticker_max_lag'],
                     ev_row['queue_ticker_idle_period'])
             rot = "%s/%s" % (ev_row['queue_ntables'], ev_row['queue_rotation_period'])
-            print("%-45s %9s %13s %6s" % (
+            print("%-33s %9s %13s %6s %6.1f %5d" % (
                 ev_row['queue_name'],
                 rot,
                 tck,
                 ev_row['ticker_lag'],
+                ev_row['ev_per_sec'],
+                ev_row['ev_new'],
             ))
         print('-' * 78)
-        print("\n%-56s %9s %9s" % (
-                'Consumer', 'Lag', 'LastSeen'))
+        print("\n%-48s %9s %9s %8s" % (
+                'Consumer', 'Lag', 'LastSeen', 'Pending'))
         print('-' * 78)
         for ev_row in event_rows:
             cons = self.pick_consumers(ev_row, consumer_rows)
@@ -78,9 +81,10 @@ class PGQStatus(skytools.DBScript):
         db.commit()
 
     def show_consumer(self, cons):
-        print("  %-54s %9s %9s" % (
+        print("  %-46s %9s %9s %8d" % (
                     cons['consumer_name'],
-                    cons['lag'], cons['last_seen']))
+                    cons['lag'], cons['last_seen'],
+                    cons['pending_events']))
 
     def show_queue(self, ev_row, consumer_rows):
         print("%(queue_name)s:" % ev_row)
-- 
cgit v1.2.3