From f89b9856b099ba3696bc477b81d7ece65d4ed47e Mon Sep 17 00:00:00 2001
From: zkldi <20380519+zkldi@users.noreply.github.com>
Date: Wed, 10 Nov 2021 04:04:24 +0000
Subject: [PATCH] Fix bug where loggers overwrote their own meta, remove
 __servername from console.

---
 server/src/lib/logger/logger.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/lib/logger/logger.ts b/server/src/lib/logger/logger.ts
index bc19530b9..7f9b8161d 100644
--- a/server/src/lib/logger/logger.ts
+++ b/server/src/lib/logger/logger.ts
@@ -44,7 +44,6 @@ const formatExcessPropertiesNoStack = (
 	omitKeys: string[] = [],
 	limit = false
 ) => {
-	let i = 0;
 	const realMeta: Record<string, unknown> = {};
 
 	for (const key in meta) {
@@ -56,13 +55,12 @@ const formatExcessPropertiesNoStack = (
 
 		if (val instanceof Error) {
 			realMeta[key] = { message: val.message };
-		} else {
+		} else if (!key.startsWith("__") && !key.startsWith("!")) {
 			realMeta[key] = val;
 		}
-		i++;
 	}
 
-	if (!i) {
+	if (Object.keys(realMeta).length === 0) {
 		return "";
 	}
 
@@ -221,7 +219,9 @@ function CreateLogCtx(filename: string, lg = rootLogger): KtLogger {
 		context: [replacedFilename],
 	}) as KtLogger;
 
-	logger.defaultMeta = { context: [replacedFilename] };
+	logger.defaultMeta = Object.assign({}, logger.defaultMeta ?? {}, {
+		context: [replacedFilename],
+	});
 	return logger;
 }