Merge branch 'dexter' into next

1 files changed, 13 insertions, 9 deletions

diff --git a/doc/zmq-ctrl/zmq_remote.py b/doc/zmq-ctrl/zmq_remote.py
index 56465d3..7581575 100755
--- a/doc/zmq-ctrl/zmq_remote.py
+++ b/doc/zmq-ctrl/zmq_remote.py
@@ -16,7 +16,7 @@ poller = zmq.Poller()
 poller.register(sock, zmq.POLLIN)
 
 if len(sys.argv) < 2:
-    print("Usage: program url cmd [args...]")
+    print("Usage: program url cmd [args...]", file=sys.stderr)
     sys.exit(1)
 
 sock.connect(sys.argv[1])
@@ -25,7 +25,7 @@ message_parts = sys.argv[2:]
 
 # first do a ping test
 
-print("ping")
+print("ping", file=sys.stderr)
 sock.send(b"ping")
 
 socks = dict(poller.poll(1000))
@@ -33,9 +33,9 @@ if socks:
     if socks.get(sock) == zmq.POLLIN:
 
         data = sock.recv_multipart()
-        print("Received: {}".format(len(data)))
+        print("Received: {}".format(len(data)), file=sys.stderr)
         for i,part in enumerate(data):
-            print("   {}".format(part))
+            print("   {}".format(part), file=sys.stderr)
 
         for i, part in enumerate(message_parts):
             if i == len(message_parts) - 1:
@@ -43,18 +43,22 @@ if socks:
             else:
                 f = zmq.SNDMORE
 
-            print("Send {}({}): '{}'".format(i, f, part))
+            print("Send {}({}): '{}'".format(i, f, part), file=sys.stderr)
 
             sock.send(part.encode(), flags=f)
 
         data = sock.recv_multipart()
 
-        print("Received: {}".format(len(data)))
-        for i,part in enumerate(data):
-            print(" RX {}: {}".format(i, part.decode().replace('\n',' ')))
+        print("Received: {}".format(len(data)), file=sys.stderr)
+        for i, part in enumerate(data):
+            if message_parts[0] == 'showjson':
+                # This allows you to pipe the JSON into another tool
+                print(part.decode())
+            else:
+                print(" RX {}: {}".format(i, part.decode().replace('\n',' ')), file=sys.stderr)
 
 else:
-    print("ZMQ error: timeout")
+    print("ZMQ error: timeout", file=sys.stderr)
     context.destroy(linger=5)
 
 # This is free and unencumbered software released into the public domain.