Disable some vif options in the helper's interface

[snf-image] / snf-image-host / host-monitor.py

diff --git a/snf-image-host/host-monitor.py b/snf-image-host/host-monitor.py
index 903b5f8..3edaf62 100755 (executable)
--- a/snf-image-host/host-monitor.py
+++ b/snf-image-host/host-monitor.py
@@ -20,7 +20,7 @@
 """Utility that generates monitoring messages for snf-image.
 
 This utility given a message type as option and the message body as input will
-print a monitoring message in stdout.
+print a monitoring message to stdout.
 """
 
 import sys
@@ -56,15 +56,18 @@ if __name__ == "__main__":
     msg['type'] = PROTOCOL[msg_type][0]
 
     lines = []
-    while True:
-        line = sys.stdin.readline()
+    if msg_type == 'stderr':
+        msg['stderr'] = sys.stdin.read()
+    else:
+        while True:
+            line = sys.stdin.readline()
 
-        if not line:
-            break
+            if not line:
+                break
 
-        lines.append(line.strip())
+            lines.append(line.strip())
+        msg[PROTOCOL[msg_type][1]] = lines
 
-    msg[PROTOCOL[msg_type][1]] = lines
     msg['timestamp'] = time.time()
     sys.stdout.write("%s\n" % json.dumps(msg))