This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch log4j-2.3.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit be848dacbac6df30c4f32b2852e24446033ecf79 Author: rgoers <[email protected]> AuthorDate: Sun Dec 19 23:30:42 2021 -0700 LOG4J2-3198 - Remove ability to perform lookups from message text --- .../apache/logging/log4j/core/pattern/MessagePatternConverter.java | 3 +-- .../org/apache/logging/log4j/core/pattern/RegexReplacementTest.java | 2 +- src/changes/changes.xml | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java index d0adc7f..3050720 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MessagePatternConverter.java @@ -68,8 +68,7 @@ public final class MessagePatternConverter extends LogEventPatternConverter { result = msg.getFormattedMessage(); } if (result != null) { - toAppendTo.append(config != null && result.contains("${") ? - config.getStrSubstitutor().replace(event, result) : result); + toAppendTo.append(result); } else { toAppendTo.append("null"); } diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java index 94fcfdf..e9d9862 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java @@ -70,7 +70,7 @@ public class RegexReplacementTest { msgs = app.getMessages(); assertNotNull(msgs); assertEquals("Incorrect number of messages. Should be 1 is " + msgs.size(), 1, msgs.size()); - assertEquals("LoggerTest This is a test for Apache" + Constants.LINE_SEPARATOR, msgs.get(0)); + assertEquals("LoggerTest This is a test for ${ctx:MyKey}" + Constants.LINE_SEPARATOR, msgs.get(0)); } @Test public void testConverter() { diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 693c46d..7d6508e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -23,6 +23,11 @@ <title>Changes</title> </properties> <body> + <release version="2.3.1" date="2021-12-xx" description="GA Release 2.3.1"> + <action issue="LOG4J2-3198" dev="rgoers" type="add"> + Pattern layout no longer enables lookups within message text. + </action> + </release> <release version="2.3" date="2015-05-09" description="GA Release 2.3"> <action issue="LOG4J2-1009" dev="ggregory" type="fix" due-to="Mikael Ståldal"> Incorrectly defined compressionType parameter to GelfLayout.
