fix websocket log recv

MrBrax · Nov 2, 2023 · 673660b · 673660b
1 parent 9c5faca
commit 673660b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client-vue/src/App.vue b/client-vue/src/App.vue
@@ -395,7 +395,7 @@ function handleWebsocketMessage(action: WebhookAction, data: any) {
             // merge log lines
             const newLines: WinstonLogLine[] = data;
 
-            if (newLines.some((line) => line.metadata.timestamp && parseISO(line.metadata.timestamp).getDay() != new Date().getDay())) {
+            if (newLines.some((line) => line.timestamp && parseISO(line.timestamp).getDay() != new Date().getDay())) {
                 // new day, clear log
                 store.clearLog();
                 store.addLog(newLines);

diff --git a/client-vue/src/components/LogViewer.vue b/client-vue/src/components/LogViewer.vue
@@ -15,12 +15,12 @@
     <div ref="logViewer" class="log_viewer">
         <table>
             <tr v-for="(line, lineIndex) in logFiltered" :key="lineIndex" :class="logLineClass(line)">
-                <td v-if="line.metadata.timestamp">
-                    {{ formatDate(line.metadata.timestamp) }}
+                <td v-if="line.timestamp">
+                    {{ formatDate(line.timestamp) }}
                 </td>
                 <td v-else>(no date)</td>
                 <td>
-                    <a @click="logSetFilter(line.metadata.module)">{{ line.metadata.module }}</a>
+                    <a @click="logSetFilter(line.module)">{{ line.module }}</a>
                 </td>
                 <td>
                     {{ line.level || "UNKNOWN" }}
@@ -61,7 +61,7 @@ const logViewer = ref<HTMLElement | null>(null);
 const logFiltered = computed((): WinstonLogLine[] => {
     return logLines.value.filter((line) => {
         if (logModule.value) {
-            return line.metadata.module === logModule.value;
+            return line.module === logModule.value;
         }
         return true;
     });

diff --git a/common/Log.ts b/common/Log.ts
@@ -3,7 +3,7 @@ export interface WinstonLogLine {
     level: string;
     module: string;
     timestamp: string;
-    metadata: {
+    metadata?: {
         [key: string]: any;
         module: string;
         timestamp: string;