From e7997fe16e805f9e20ddb91b41f0bf1c1b93bbe3 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Wed, 18 Dec 2024 12:16:16 +0100 Subject: [PATCH] UI: fix log trace areas with special characters (#17780) --- assets/js/views/Log.vue | 8 ++++---- util/logstash/element.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/views/Log.vue b/assets/js/views/Log.vue index 7f52221da..c752972b4 100644 --- a/assets/js/views/Log.vue +++ b/assets/js/views/Log.vue @@ -197,7 +197,7 @@ export default { }, }, watch: { - selectedAreas() { + areas() { this.updateLogs(); }, level() { @@ -339,7 +339,7 @@ export default { --opacity: 1; opacity: var(--opacity); animation-name: fadeIn; - animation-duration: 1s; + animation-duration: var(--transition-duration-fast); animation-fill-mode: forwards; animation-timing-function: ease-out; text-indent: 1rem hanging; @@ -361,9 +361,9 @@ export default { color: var(--bs-danger); } .log-debug { - --opacity: 0.6; + --opacity: 0.7; } .log-trace { - --opacity: 0.4; + --opacity: 0.5; } diff --git a/util/logstash/element.go b/util/logstash/element.go index 695e84590..b0fc1aa51 100644 --- a/util/logstash/element.go +++ b/util/logstash/element.go @@ -9,7 +9,7 @@ import ( type element string -var re = regexp.MustCompile(`^\[([a-zA-Z0-9-]+)\s*\] (\w+) `) +var re = regexp.MustCompile(`^\[(.+?)\s*\] (\w+) `) func (e element) areaLevel() (string, jww.Threshold) { m := re.FindAllStringSubmatch(string(e), 1)