From 64ac53cef09ed853373b7a096d29d51bdf9ad15b Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Mon, 10 Oct 2016 15:55:39 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Short=20log=20still=20needs=20da?=
 =?UTF-8?q?ta.msg=20(#7532)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- to see the problem, migrate a fresh DB in short mode
- this would output [INFO] but no info!
---
 core/server/logging/PrettyStream.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/server/logging/PrettyStream.js b/core/server/logging/PrettyStream.js
index bcf4fffb6a..5e2be08fb0 100644
--- a/core/server/logging/PrettyStream.js
+++ b/core/server/logging/PrettyStream.js
@@ -116,9 +116,6 @@ PrettyStream.prototype.write = function write(data) {
                 bodyPretty += colorize('white', value) + '\n';
             }
         });
-    } else {
-        // print string
-        bodyPretty += data.msg;
     }
 
     try {
@@ -136,6 +133,12 @@ PrettyStream.prototype.write = function write(data) {
                 time,
                 logLevel
             );
+        } else if (data.msg) {
+            output += format('[%s] %s %s\n',
+                time,
+                logLevel,
+                data.msg
+            );
         } else {
             output += format('[%s] %s\n',
                 time,