qadmin updated

diff --git a/doc/qadmin.txt b/doc/qadmin.txt
index 7ea9dd5668aa8b64ac218e024078c89743c89710..f66e97d9b7273d984c732da16ba9ea4dae7e0b6a 100644 (file)
--- a/doc/qadmin.txt
+++ b/doc/qadmin.txt
@@ -129,6 +129,10 @@ Show DDL for the specified sequence.
 
 Show details of one or all consumers on one or all queues.
 
+=== show node [ <node | *> [on <qname>] ]; ===
+
+Show details of one or all nodes on one or all queues.
+
 === show batch <batch_id>; ===
 
 Show details of the batch, default queue must be set (see `connect queue`)
@@ -278,7 +282,6 @@ TODO : is it up-to-date ?
 - drop node <name> [on <qname>];
 - takeover <oldnode>;
 
-- show node [ <node | *> [on <qname>] ];
 - show cascade;
 - show_queue_stats <q>;
 - status

diff --git a/python/qadmin.py b/python/qadmin.py
index 14d00224460bec3752fcc1dfea7727d4f21bd9a4..00d759f813675e568cc59257421f6c77a729fa4b 100755 (executable)
--- a/python/qadmin.py
+++ b/python/qadmin.py
@@ -6,20 +6,20 @@
     connect [ queue=.. ] [ node=.. ];
     install pgq | londiste;
 
+    show queue [ <qname | *> ];
     create queue <qname>;
     alter queue <qname | *> set param = , ...;
     drop queue <qname>;
-    show queue [ <qname | *> ];
-    show table <tbl>;
-    show sequence <seq>;
 
+    show consumer [ <cname | *> [on <qname>] ];
     register consumer <consumer> [on <qname> | at <tick_id> | copy <consumer> ]* ;
     unregister consumer <consumer | *> [from <qname>];
-
     register subconsumer <subconsumer> for <consumer> [on <qname>];
     unregister subconsumer <subconsumer | *> for <consumer> [from <qname>] [close [batch]];
 
-    show consumer [ <cname | *> [on <qname>] ];
+    show node [ <node | *> [on <qname>] ];
+    show table <tbl>;
+    show sequence <seq>;
 
 Following commands expect default queue: