feat issue #1341 (Layouts) : use split instead of regexp

This commit is contained in:
Benoît Lefèvre 2022-11-30 23:21:46 +01:00
parent ab43399200
commit e01c3c7bbf

View File

@ -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);
}