summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-12-01 13:20:38 +0000
committerMarko Kreen2010-12-01 13:20:38 +0000
commit67597d1c74eb581430d1218c28cbe402059e5f1b (patch)
tree5c21da3da8dd265cadbe0b67c8b1486f22d48bb9
parentcdc972f6b2e863fd895fe16665d19d83bc9e17f0 (diff)
londiste: show table counts in 'status'
-rw-r--r--python/londiste/setup.py14
-rw-r--r--python/pgq/cascade/nodeinfo.py2
2 files changed, 15 insertions, 1 deletions
diff --git a/python/londiste/setup.py b/python/londiste/setup.py
index e8b20310..fc1ddd58 100644
--- a/python/londiste/setup.py
+++ b/python/londiste/setup.py
@@ -453,3 +453,17 @@ class LondisteSetup(CascadeAdmin):
raise UsageError("Cannot proceed")
return res_list
+ def load_extra_status(self, curs, node):
+ """Fetch extra info."""
+ CascadeAdmin.load_extra_status(self, curs, node)
+ curs.execute("select * from londiste.get_table_list(%s)", [self.queue_name])
+ n_ok = n_half = n_ign = 0
+ for tbl in curs.fetchall():
+ if not tbl['local']:
+ n_ign += 1
+ elif tbl['merge_state'] == 'ok':
+ n_ok += 1
+ else:
+ n_half += 1
+ node.add_info_line('Tables: %d/%d/%d' % (n_ok, n_half, n_ign))
+
diff --git a/python/pgq/cascade/nodeinfo.py b/python/pgq/cascade/nodeinfo.py
index 97d24f36..96794bb5 100644
--- a/python/pgq/cascade/nodeinfo.py
+++ b/python/pgq/cascade/nodeinfo.py
@@ -100,7 +100,7 @@ class NodeInfo:
lag = self.queue_info['ticker_lag']
else:
lag = "(n/a)"
- txt = "lag: %s" % lag
+ txt = "Lag: %s" % lag
if self.paused:
txt += ", PAUSED"
if not self.uptodate: