From e01c3c7bbf6d434957bbf53ff55950241d259f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Lef=C3=A8vre?= Date: Wed, 30 Nov 2022 23:21:46 +0100 Subject: [PATCH] feat issue #1341 (Layouts) : use split instead of regexp --- lib/layouts.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/layouts.js b/lib/layouts.js index 2660a7e..a969324 100644 --- a/lib/layouts.js +++ b/lib/layouts.js @@ -139,8 +139,6 @@ function patternLayout(pattern, tokens) { const regex = /%(-?[0-9]+)?(\.?-?[0-9]+)?([[\]cdhmnprzxXyflosCMAF%])(\{([^}]+)\})?|([^%]+)/; - const mSpecifierRegex = /\s*(-?\d)(\s*,\s*(-?\d))?\w*/; - pattern = pattern || TTCC_CONVERSION_PATTERN; function categoryName(loggingEvent, specifier) { @@ -215,12 +213,8 @@ function patternLayout(pattern, tokens) { } function formatMessage(loggingEvent, specifier) { - const match = mSpecifierRegex.exec(specifier); - - const lowerBound = match ? parseInt(match[1], 10) : 0; - const upperBound = match && match[3] ? parseInt(match[3], 10) : undefined; + const [lowerBound, upperBound] = specifier ? specifier.split(',') : []; const dataSlice = loggingEvent.data.slice(lowerBound, upperBound); - return util.format(...dataSlice); }