You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/01/10 21:24:03 UTC
[1/2] logging-log4j2 git commit: LOG4J-1724 Fix backwards
compatibility when using additional fields
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3ebc6b06d -> a6f9d12bd
LOG4J-1724 Fix backwards compatibility when using additional fields
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6dc41d76
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6dc41d76
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6dc41d76
Branch: refs/heads/master
Commit: 6dc41d761a51db83ec9d33b1252b150d152ff1c3
Parents: 0c2c11d
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Jan 10 22:23:42 2017 +0100
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Jan 10 22:23:42 2017 +0100
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/layout/GelfLayout.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6dc41d76/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
index 0c757aa..7504087 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java
@@ -245,8 +245,12 @@ public final class GelfLayout extends AbstractStringLayout {
super(config, StandardCharsets.UTF_8, null, null);
this.host = host != null ? host : NetUtils.getLocalHostname();
this.additionalFields = additionalFields != null ? additionalFields : new KeyValuePair[0];
- if (this.additionalFields.length > 0 && config == null) {
- throw new IllegalArgumentException("configuration needs to be set when there are additional fields");
+ if (config == null) {
+ for (KeyValuePair additionalField : this.additionalFields) {
+ if (valueNeedsLookup(additionalField.getValue())) {
+ throw new IllegalArgumentException("configuration needs to be set when there are additional fields with variables");
+ }
+ }
}
this.compressionType = compressionType;
this.compressionThreshold = compressionThreshold;
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by mi...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a6f9d12b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a6f9d12b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a6f9d12b
Branch: refs/heads/master
Commit: a6f9d12bd93ca7c7517c3d22addbfaa236252a5c
Parents: 6dc41d7 3ebc6b0
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Jan 10 22:23:49 2017 +0100
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Jan 10 22:23:49 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/LoggerContext.java | 1 -
.../java/org/apache/logging/log4j/junit/CleanFiles.java | 9 +++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------