From 4567b087be96ad036b55d4b167fdd857ed17a2e8 Mon Sep 17 00:00:00 2001 From: lefp <70862148+lefp@users.noreply.github.com> Date: Mon, 1 Apr 2024 09:03:40 -0400 Subject: [PATCH 1/2] Fix invalid regex in lnav_format_loguru_cpp.json --- lnav_format_loguru_cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnav_format_loguru_cpp.json b/lnav_format_loguru_cpp.json index bd9ca367..20ce7ea9 100644 --- a/lnav_format_loguru_cpp.json +++ b/lnav_format_loguru_cpp.json @@ -5,7 +5,7 @@ "url": "", "regex": { "main" : { - "pattern": "^(?\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) \\((?.*)s\\) \\[(?.*)\\]\\s+(?\\S+):(?\\w+)\\s+(?\\w+)\\| (?\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) \\((?.*)s\\) \\[(?.*)\\]\\s+(?\\S+):(?\\w+)\\s+(?\\w+)\\| (?.*)$" } }, "level-field": "level", From 1eed05b870880ab2be299eb833850ef290ab831f Mon Sep 17 00:00:00 2001 From: Peter Lef Date: Sat, 6 Apr 2024 06:53:30 -0400 Subject: [PATCH 2/2] lnav: rm incorrect whitespace requirement from regex Whitespace is not guaranteed to exist after the `[thread]` field; particularly in the case of long filenames --- lnav_format_loguru_cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnav_format_loguru_cpp.json b/lnav_format_loguru_cpp.json index 20ce7ea9..ab9dd718 100644 --- a/lnav_format_loguru_cpp.json +++ b/lnav_format_loguru_cpp.json @@ -5,7 +5,7 @@ "url": "", "regex": { "main" : { - "pattern": "^(?\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) \\((?.*)s\\) \\[(?.*)\\]\\s+(?\\S+):(?\\w+)\\s+(?\\w+)\\| (?.*)$" + "pattern": "^(?\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) \\((?.*)s\\) \\[(?.*)\\]\\s*(?\\S+):(?\\w+)\\s+(?\\w+)\\| (?.*)$" } }, "level-field": "level",