From 24060b6d2afc9d79869daf2699521c9b3d54da58 Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Mon, 8 Jan 2024 11:53:37 +0000
Subject: [PATCH] Cope with multiline logs

---
 .../paneBackgroundDetect.vue                  |  2 +-
 .../tabContentComponents/loggingContent.vue   | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue
index ea95d517..cf6283a3 100644
--- a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue
+++ b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue
@@ -86,7 +86,7 @@ export default {
       this.modalNotify(`Background image has been updated`);
     },
     alertImageLabel(r) {
-      let label = r.output===true? 'sample' : 'background'
+      let label = r.output === true ? "sample" : "background";
       this.modalNotify(`Current image is ${label}`);
     }
   }
diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue
index 56a51686..6a957678 100644
--- a/webapp/src/components/tabContentComponents/loggingContent.vue
+++ b/webapp/src/components/tabContentComponents/loggingContent.vue
@@ -141,12 +141,22 @@ export default {
       for (let line of lines) {
         if (line.length > 0) {
           let m = line.match(regexp);
-          this.logs.push({
-            timestamp: m[1],
-            level: m[2],
-            message: m[3],
-            sequence: this.logs.length
-          });
+          if (m) {
+            this.logs.push({
+              timestamp: m[1],
+              level: m[2],
+              message: m[3],
+              sequence: this.logs.length
+            });
+          } else if (this.logs) {
+            // If a line does not look like a log entry, append it to the last
+            // log entry (i.e. allow multi-line messages)
+            this.logs[this.logs.length - 1].message += "\n" + line;
+          } else {
+            // if there's no existing log message to append to, discard lines
+            // until we find one.
+            continue;
+          }
         }
       }
     },