Merge pull request #1353 from nrkno/fix/sofie-3679/pogw-log-output

nrkno · Jan 8, 2025 · 255c27c · 255c27c
2 parents 4253eea + 0d2b844
commit 255c27c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/live-status-gateway/src/index.ts b/packages/live-status-gateway/src/index.ts
@@ -12,6 +12,16 @@ const myFormat = combine(
 	splat(),
 	printf((obj) => {
 		obj.localTimestamp = new Date().toISOString()
+		// Prevent errors and other objects to be inserted as Objects into message field
+		if (typeof obj.message === 'object') {
+			if (obj.message instanceof Error) {
+				const errorObj = obj.message
+				obj.message = errorObj.message
+				obj.details = errorObj
+			} else {
+				obj.message = JSON.stringify(obj.message)
+			}
+		}
 		return JSON.stringify(obj) // make single line
 	})
 )

diff --git a/packages/playout-gateway/src/index.ts b/packages/playout-gateway/src/index.ts
@@ -12,6 +12,16 @@ const myFormat = combine(
 	splat(),
 	printf((obj) => {
 		obj.localTimestamp = new Date().toISOString()
+		// Prevent errors and other objects to be inserted as Objects into message field
+		if (typeof obj.message === 'object') {
+			if (obj.message instanceof Error) {
+				const errorObj = obj.message
+				obj.message = errorObj.message
+				obj.details = errorObj
+			} else {
+				obj.message = JSON.stringify(obj.message)
+			}
+		}
 		return JSON.stringify(obj) // make single line
 	})
 )