Author: rgoers
Date: Fri Mar 30 03:45:15 2012
New Revision: 1307229
URL: http://svn.apache.org/viewvc?rev=1307229&view=rev
Log:
MDC values are not added to FlumeEvent if no include or exclude specified.
RFC5424Layout.create was called with incorrect arguments
Modified:
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroAppender.java
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java
Modified:
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1307229&r1=1307228&r2=1307229&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
Fri Mar 30 03:45:15 2012
@@ -177,6 +177,7 @@ public class FileAppenderTest {
}
fis.close();
assertTrue("Incorrect count: was " + counter + " should be " + count,
count == counter);
+ fis.close();
}
Modified:
logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1307229&r1=1307228&r2=1307229&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
Fri Mar 30 03:45:15 2012
@@ -98,6 +98,8 @@ public class FlumeEvent extends SimpleEv
}
}
}
+ } else {
+ ctx.putAll(mdc);
}
if (required != null) {
Modified:
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroAppender.java?rev=1307229&r1=1307228&r2=1307229&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeAvroAppender.java
Fri Mar 30 03:45:15 2012
@@ -161,8 +161,8 @@ public final class FlumeAvroAppender ext
int retries = agentRetries == null ? 0 :
Integer.parseInt(agentRetries);
if (layout == null) {
- layout = RFC5424Layout.createLayout(null, null, null, null,
"True", null, null, null, null, excludes,
- includes, required, null);
+ layout = RFC5424Layout.createLayout(null, null, null, "true",
null, null, null, null, excludes,
+ includes, required, null, null);
}
if (name == null) {
Modified:
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java?rev=1307229&r1=1307228&r2=1307229&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j2-flume-og/src/main/java/org/apache/logging/log4j/flumeog/appender/FlumeEvent.java
Fri Mar 30 03:45:15 2012
@@ -104,6 +104,8 @@ public class FlumeEvent extends EventBas
}
}
}
+ } else {
+ ctx.putAll(mdc);
}
if (required != null) {
