You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/04/17 04:38:30 UTC
[logging-log4j2] branch release-2.x updated: LOG4J2-2814 - Fix
Javadoc in ScriptPatternSelector
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 6ab7cb9 LOG4J2-2814 - Fix Javadoc in ScriptPatternSelector
6ab7cb9 is described below
commit 6ab7cb9937c2cc0d2965ce326fb66679627443f4
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Thu Apr 16 21:38:17 2020 -0700
LOG4J2-2814 - Fix Javadoc in ScriptPatternSelector
---
.../org/apache/logging/log4j/core/layout/ScriptPatternSelector.java | 4 +++-
src/changes/changes.xml | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index c52b867..addf5e3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -39,7 +39,9 @@ import org.apache.logging.log4j.core.script.ScriptRef;
import org.apache.logging.log4j.status.StatusLogger;
/**
- * Selects the pattern to use based on the Marker in the LogEvent.
+ * Selects the pattern to use based on the result of executing a Script. The returned value will be used as the "key"
+ * to choose between one of the configured patterns. If no key is returned or there is no match the default
+ * pattern will be used.
*/
@Plugin(name = "ScriptPatternSelector", category = Node.CATEGORY, elementType = PatternSelector.ELEMENT_TYPE, printObject = true)
public class ScriptPatternSelector implements PatternSelector, LocationAware {
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e64c4b4..ecc2b02 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
<release version="2.13.2" date="2020-MM-DD" description="GA Release 2.13.2">
+ <action issue="LOG4J2-2814" dev="rgoers" type="fix">
+ Fix Javadoc for ScriptPatternSelector.
+ </action>
<action issue="LOG4J2-2793" dev="rgoers" type="fix" due-to="Renukaprasad C">
Allow trailing and leading spaces in log level.
</action>