monitor: fix the report content output

948de42d · Hardik Juneja · Rafael Monnerat · 6f907b4f · 948de42d
Commit 948de42d authored Jun 01, 2017 by Hardik Juneja Committed by Rafael Monnerat Jun 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

slapos/monitor/runpromise.py slapos/monitor/runpromise.py +6 -4

No files found.
--- a/slapos/monitor/runpromise.py
+++ b/slapos/monitor/runpromise.py
@@ -248,12 +248,14 @@ class RunPromise(object):
    status_json = {}
    if process.returncode != 0:
      status_json["status"] = "ERROR"
+      if not stdout:
+        status_json["message"] = stderr
+      else:
+        status_json["message"] = stdout
    else:
-      status_json["status"] = "OK"
-    if stderr:
-      status_json["message"] = stderr
-    elif stdout:
+      status_json["status"] = "OK" 
      status_json["message"] = stdout
+
    if start_date:
      status_json["start-date"] = start_date
    if title: