From e6546e62639279ae1e765a56069541ef5b666748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Thu, 18 Oct 2018 12:17:07 -0400
Subject: [PATCH] #6848

this handles winston.error(err);
---
 src/prestart.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/prestart.js b/src/prestart.js
index 60edbc7ed3..f9d9e20cd7 100644
--- a/src/prestart.js
+++ b/src/prestart.js
@@ -12,9 +12,25 @@ function setupWinston() {
 	if (!winston.format) {
 		return;
 	}
+	// https://github.com/winstonjs/winston/issues/1338
+	// error objects are not displayed properly
+	const enumerateErrorFormat = winston.format((info) => {
+		if (info.message instanceof Error) {
+			info.message = Object.assign({
+				message: `${info.message.message}\n${info.message.stack}`,
+			}, info.message);
+		}
 
-	var formats = [];
+		if (info instanceof Error) {
+			return Object.assign({
+				message: `${info.message}\n${info.stack}`,
+			}, info);
+		}
 
+		return info;
+	});
+	var formats = [];
+	formats.push(enumerateErrorFormat());
 	if (nconf.get('log-colorize') !== 'false') {
 		formats.push(winston.format.colorize());
 	}