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 2018/03/18 18:24:06 UTC
[1/2] logging-log4j2 git commit: LOG4J2-2268 - Improve error msg if
invalid value
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x eb28cd710 -> 5d01d299d
LOG4J2-2268 - Improve error msg if invalid value
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/34e05687
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/34e05687
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/34e05687
Branch: refs/heads/release-2.x
Commit: 34e056872041861f22235a01c47f69db76ae8f85
Parents: eb28cd7
Author: Tilman Hausherr <ti...@snafu.de>
Authored: Tue Mar 13 22:23:02 2018 +0100
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Mar 18 11:03:31 2018 -0700
----------------------------------------------------------------------
.../log4j/core/config/plugins/util/PluginBuilder.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/34e05687/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
index ebaabe9..443c612 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -165,6 +166,7 @@ public class PluginBuilder implements Builder<Object> {
AccessibleObject.setAccessible(fields.toArray(new Field[] {}), true);
final StringBuilder log = new StringBuilder();
boolean invalid = false;
+ String reason = "";
for (final Field field : fields) {
log.append(log.length() == 0 ? simpleName(builder) + "(" : ", ");
final Annotation[] annotations = field.getDeclaredAnnotations();
@@ -194,13 +196,17 @@ public class PluginBuilder implements Builder<Object> {
for (final ConstraintValidator<?> validator : validators) {
if (!validator.isValid(field.getName(), value)) {
invalid = true;
+ if (!reason.isEmpty()) {
+ reason += ", ";
+ }
+ reason += "field '" + field.getName() + "' has invalid value '" + value + "'";
}
}
}
log.append(log.length() == 0 ? builder.getClass().getSimpleName() + "()" : ")");
LOGGER.debug(log.toString());
if (invalid) {
- throw new ConfigurationException("Arguments given for element " + node.getName() + " are invalid");
+ throw new ConfigurationException("Arguments given for element " + node.getName() + " are invalid: " + reason);
}
checkForRemainingAttributes();
verifyNodeChildrenUsed();
[2/2] logging-log4j2 git commit: Closes #160
Posted by rg...@apache.org.
Closes #160
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5d01d299
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5d01d299
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5d01d299
Branch: refs/heads/release-2.x
Commit: 5d01d299d17fe34d6ac6bc27119fdfb54c2d649a
Parents: 34e0568
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Mar 18 11:23:54 2018 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Mar 18 11:23:54 2018 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5d01d299/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 682e00e..38a071b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,11 @@
- "update" - Change
- "remove" - Removed
-->
+ <release version="2.11.1" date="2018-MM-DD" description="GA Release 2.11.1">
+ <action issue="LOG4J2-2268" dev="rgoers" type="fix" due-to="Tilman Hausherr">
+ Improve plugin error message when elements are missing.
+ </action>
+ </release>
<release version="2.11.0" date="2018-03-11" description="GA Release 2.11.0">
<action issue="LOG4J2-2104" dev="rgoers" type="fix">
LoaderUtil was not looping properly over classloaders.