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 2013/04/19 07:33:44 UTC
svn commit: r1469699 - in /logging/log4j/log4j2/trunk:
core/src/main/java/org/apache/logging/log4j/core/config/
core/src/test/java/org/apache/logging/log4j/core/ core/src/test/resources/
flume-ng/src/test/resources/ src/changes/
Author: rgoers
Date: Fri Apr 19 05:33:44 2013
New Revision: 1469699
URL: http://svn.apache.org/r1469699
Log:
LOG4J2-212 - Loggers without a . had no parent logger.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml
logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Fri Apr 19 05:33:44 2013
@@ -780,6 +780,8 @@ public class BaseConfiguration extends A
parent = root;
}
logger.setParent(parent);
+ } else {
+ logger.setParent(root);
}
}
}
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java Fri Apr 19 05:33:44 2013
@@ -259,7 +259,9 @@ public class LoggerTest {
@Test
public void testAdditivity() throws Exception {
Logger localLogger = (Logger) LogManager.getLogger("org.apache.test");
-
+ localLogger.error("Test parent additivity");
+ final List<LogEvent> events = app.getEvents();
+ assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
}
}
Modified: logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/log4j-failover.xml Fri Apr 19 05:33:44 2013
@@ -34,7 +34,7 @@
</Appenders>
<loggers>
- <logger name="Once" level="error" additvity="false">
+ <logger name="Once" level="error" additivity="false">
<appender-ref ref="FailoverOnce"/>
</logger>
<root level="error">
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/default_embedded.xml Fri Apr 19 05:33:44 2013
@@ -11,7 +11,7 @@
</Console>
</appenders>
<loggers>
- <logger name="EventLogger" level="info">
+ <logger name="EventLogger" level="info" additivity="false">
<appender-ref ref="eventLogger"/>
</logger>
<root level="error">
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/embedded.xml Fri Apr 19 05:33:44 2013
@@ -27,7 +27,7 @@
</Console>
</appenders>
<loggers>
- <logger name="EventLogger" level="info">
+ <logger name="EventLogger" level="info" additivity="false">
<appender-ref ref="eventLogger"/>
</logger>
<root level="warn">
Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/resources/persistent.xml Fri Apr 19 05:33:44 2013
@@ -14,7 +14,7 @@
</Console>
</appenders>
<loggers>
- <logger name="EventLogger" level="info">
+ <logger name="EventLogger" level="info" additivity="false">
<appender-ref ref="eventLogger"/>
</logger>
<root level="error">
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1469699&r1=1469698&r2=1469699&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Fri Apr 19 05:33:44 2013
@@ -23,6 +23,9 @@
<body>
<release version="2.0-beta5" date="@TBD@" description="Bug fixes and enhancements">
+ <action issue="LOG4J2-212" dev="rgoers" type="fix">
+ Loggers without a "." had no parent logger.
+ </action>
<action issue="LOG4J2-208" dev="rgoers" type="update" due-to="Remko Popma">
Move async subproject into core.
</action>