You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/06/15 08:40:04 UTC
svn commit: r1602666 - in /logging/log4j/log4j2/trunk/log4j-core/src:
main/java/org/apache/logging/log4j/core/config/
test/java/org/apache/logging/log4j/core/appender/
test/java/org/apache/logging/log4j/core/async/ test/resources/
Author: rpopma
Date: Sun Jun 15 06:40:04 2014
New Revision: 1602666
URL: http://svn.apache.org/r1602666
Log:
LOG4J2-392: bugfix: similar to stopping loggers in AbstractConfig.stop(), avoid starting the same AsyncLoggerConfig twice: this will mess up the ref count in AsyncLoggerConfigHelper
Added:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml (with props)
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java?rev=1602666&r1=1602665&r2=1602666&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java Sun Jun 15 06:40:04 2014
@@ -151,13 +151,17 @@ public abstract class AbstractConfigurat
setup();
setupAdvertisement();
doConfigure();
+ final Set<LoggerConfig> alreadyStarted = new HashSet<LoggerConfig>();
for (final LoggerConfig logger : loggers.values()) {
logger.start();
+ alreadyStarted.add(logger);
}
for (final Appender appender : appenders.values()) {
appender.start();
}
- root.start(); // LOG4J2-336
+ if (!alreadyStarted.contains(root)) { // LOG4J2-392
+ root.start(); // LOG4J2-336
+ }
super.start();
LOGGER.debug("Started configuration {} OK.", this);
}
@@ -185,7 +189,7 @@ public abstract class AbstractConfigurat
}
}
// similarly, first stop AsyncLoggerConfig Disruptor thread(s)
- Set<LoggerConfig> alreadyStopped = new HashSet<LoggerConfig>();
+ final Set<LoggerConfig> alreadyStopped = new HashSet<LoggerConfig>();
int asyncLoggerConfigCount = 0;
for (final LoggerConfig logger : loggers.values()) {
if (logger instanceof AsyncLoggerConfig) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java?rev=1602666&r1=1602665&r2=1602666&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java Sun Jun 15 06:40:04 2014
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -41,7 +40,6 @@ public class XmlCompactFileAppenderTest
"XmlCompactFileAppenderTest.xml");
}
- @Ignore // stopgap solution for broken build in revision 1602598 (LOG4J2-392)
@Test
public void testFlushAtEndOfBatch() throws Exception {
final File file = new File("target", "XmlCompactFileAppenderTest.log");
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java?rev=1602666&r1=1602665&r2=1602666&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java Sun Jun 15 06:40:04 2014
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -41,7 +40,6 @@ public class XmlCompleteFileAppenderTest
"XmlCompleteFileAppenderTest.xml");
}
- @Ignore // stopgap solution for broken build in revision 1602598 (LOG4J2-392)
@Test
public void testFlushAtEndOfBatch() throws Exception {
final File f = new File("target", "XmlCompleteFileAppenderTest.log");
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java?rev=1602666&r1=1602665&r2=1602666&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java Sun Jun 15 06:40:04 2014
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -41,7 +40,6 @@ public class XmlFileAppenderTest {
"XmlFileAppenderTest.xml");
}
- @Ignore // stopgap solution for broken build in revision 1602598 (LOG4J2-392)
@Test
public void testFlushAtEndOfBatch() throws Exception {
final File f = new File("target", "XmlFileAppenderTest.log");
Added: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java?rev=1602666&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java Sun Jun 15 06:40:04 2014
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.async;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LifeCycle;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class AsyncLoggerConfigAutoFlushTest {
+
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
+ "AsyncLoggerConfigAutoFlushTest.xml");
+ }
+
+ @Test
+ public void testFlushAtEndOfBatch() throws Exception {
+ final File f = new File("target", "AsyncLoggerConfigAutoFlushTest.log");
+ assertTrue("Deleted old file before test", !f.exists() || f.delete());
+
+ final Logger log = LogManager.getLogger("com.foo.Bar");
+ final String msg = "Message flushed with immediate flush=false";
+ log.info(msg);
+ ((LifeCycle) LogManager.getContext()).stop(); // stop async thread
+
+ final BufferedReader reader = new BufferedReader(new FileReader(f));
+ final String line1 = reader.readLine();
+ reader.close();
+ f.delete();
+ assertNotNull("line1", line1);
+ assertTrue("line1 correct", line1.contains(msg));
+ }
+}
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAutoFlushTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml?rev=1602666&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml Sun Jun 15 06:40:04 2014
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="off">
+ <Appenders>
+ <File name="File"
+ fileName="target/AsyncLoggerConfigAutoFlushTest.log"
+ bufferedIO="true"
+ immediateFlush="false"
+ append="false">
+ <PatternLayout>
+ <Pattern>%d %p %c{1.} [%t] %X{aKey} %m %location %ex%n</Pattern>
+ </PatternLayout>
+ </File>
+ </Appenders>
+
+ <Loggers>
+ <AsyncRoot level="info" includeLocation="true">
+ <AppenderRef ref="File"/>
+ </AsyncRoot>
+ </Loggers>
+</Configuration>
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/AsyncLoggerConfigAutoFlushTest.xml
------------------------------------------------------------------------------
svn:eol-style = native