node-status cleanup

diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 02f8877f4855578bff30325fa7cb42ae4663f2e9..c581021d9de72f2a9afd0419f647c4c12776939b 100644 (file)
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -36,6 +36,7 @@ Node Administration:
   wait-root             Wait until node has catched up to root
   wait-provider         Wait until node has catched up to provider
   status                Show cascade state
+  node-status           Show status of a local node
   members               Show members in set
 
 Cascade layout change:
@@ -385,26 +386,22 @@ class CascadeAdmin(skytools.AdminScript):
         """
         Show status of a local node.
         """
-        try:
-            self.load_local_info()
-            db = self.get_node_database(self.local_node)
-            curs = db.cursor()
-            node = self.queue_info.local_node
-            node.load_status(curs)
-            self.load_extra_status(curs, node)
-
-            subscriber_nodes = self.get_node_subscriber_list(self.local_node)
-
-            offset=4*' '
-            print node.get_title()
-            print offset+'Provider: %s' % node.provider_node
-            print offset+'Subscribers: %s' % ', '.join(subscriber_nodes)
-            for l in node.get_infolines():
-                print offset+l
-
-        except DBError, d:
-            msg = str(d).strip().split('\n', 1)[0]
-            print('Node %s failure: %s' % (self.local_node, msg))
+
+        self.load_local_info()
+        db = self.get_node_database(self.local_node)
+        curs = db.cursor()
+        node = self.queue_info.local_node
+        node.load_status(curs)
+        self.load_extra_status(curs, node)
+
+        subscriber_nodes = self.get_node_subscriber_list(self.local_node)
+
+        offset=4*' '
+        print node.get_title()
+        print offset+'Provider: %s' % node.provider_node
+        print offset+'Subscribers: %s' % ', '.join(subscriber_nodes)
+        for l in node.get_infolines():
+            print offset+l
 
     def load_extra_status(self, curs, node):
         """Fetch extra info."""