From eb31b46e6f9c1b11567442950416a3be6eaa2444 Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Sat, 4 Nov 2023 13:51:29 -0700 Subject: [PATCH] fix: fixes a potential rare edge case that log entry has no payload. see #2451. (#2471) --- assets/models/LogEntry.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/models/LogEntry.ts b/assets/models/LogEntry.ts index b228624c..f346db03 100644 --- a/assets/models/LogEntry.ts +++ b/assets/models/LogEntry.ts @@ -144,7 +144,15 @@ export class SkippedLogsEntry extends LogEntry { } export function asLogEntry(event: LogEvent): LogEntry { - if (typeof event.m === "string") { + if (isObject(event.m)) { + return new ComplexLogEntry( + event.m, + event.id, + new Date(event.ts), + event.l, + event.s === "unknown" ? "stderr" : event.s ?? "stderr", + ); + } else { return new SimpleLogEntry( event.m, event.id, @@ -153,13 +161,5 @@ export function asLogEntry(event: LogEvent): LogEntry { event.p, event.s === "unknown" ? "stderr" : event.s ?? "stderr", ); - } else { - return new ComplexLogEntry( - event.m, - event.id, - new Date(event.ts), - event.l, - event.s === "unknown" ? "stderr" : event.s ?? "stderr", - ); } }