From f5a41f76f323c19ce77ea6e5564a021d73812d23 Mon Sep 17 00:00:00 2001 From: jaknapper Date: Mon, 7 Apr 2025 18:07:51 +0100 Subject: [PATCH 1/3] Lazier regex for finding logs with square brackets --- webapp/src/components/tabContentComponents/loggingContent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index 85547734..ea7425fd 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -153,7 +153,7 @@ export default { let response = await axios.get(this.logFileURI); let lines = response.data.split("\n"); let logs = []; - let regexp = /\[(.+)\] \[(.+)\] (.*)$/; + let regexp = /\[(.+?)\] \[(.+?)\] (.*)$/; for (let line of lines) { if (line.length > 0) { let m = line.match(regexp); From 4f8e508dd580701679cc343e346aad5b90b29353 Mon Sep 17 00:00:00 2001 From: Joe Knapper Date: Wed, 14 May 2025 15:12:17 +0000 Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Julian Stirling --- webapp/src/components/tabContentComponents/loggingContent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index ea7425fd..62d0f25e 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -153,7 +153,7 @@ export default { let response = await axios.get(this.logFileURI); let lines = response.data.split("\n"); let logs = []; - let regexp = /\[(.+?)\] \[(.+?)\] (.*)$/; +^\[(.+?)\] \[(DEBUG|INFO|WARNING|ERROR|CRITICAL)\] (.*)$ for (let line of lines) { if (line.length > 0) { let m = line.match(regexp); From a1ef332e313e820a288aa11faeb670ed9a3d80a3 Mon Sep 17 00:00:00 2001 From: jaknapper Date: Wed, 14 May 2025 16:36:16 +0100 Subject: [PATCH 3/3] Set regexp equal to new format --- webapp/src/components/tabContentComponents/loggingContent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index 62d0f25e..eaa5268d 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -153,7 +153,7 @@ export default { let response = await axios.get(this.logFileURI); let lines = response.data.split("\n"); let logs = []; -^\[(.+?)\] \[(DEBUG|INFO|WARNING|ERROR|CRITICAL)\] (.*)$ + let regexp = /^\[(.+?)\] \[(DEBUG|INFO|WARNING|ERROR|CRITICAL)\] (.*)$/; for (let line of lines) { if (line.length > 0) { let m = line.match(regexp);