diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultLocationTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultLocationTest.java
index ac44aa5a7..0dd56842a 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultLocationTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultLocationTest.java
@@ -16,10 +16,6 @@
*/
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.LogEvent;
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncRootLoggerDefaultLocationTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncRootLoggerDefaultLocationTest.java
new file mode 100644
index 000000000..22379787c
--- /dev/null
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncRootLoggerDefaultLocationTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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 org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.core.test.categories.AsyncLoggers;
+import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.util.Strings;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+@Category(AsyncLoggers.class)
+public class AsyncRootLoggerDefaultLocationTest {
+
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
+ "AsyncRootLoggerDefaultLocationTest.xml");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, Strings.EMPTY);
+ }
+
+ @Test
+ public void testAsyncLogWritesToLog() throws Exception {
+ LoggerContext context = (LoggerContext) LogManager.getContext(false);
+ ListAppender app = context.getConfiguration().getAppender("List");
+ assertNotNull(app);
+ final Logger log = context.getLogger("com.foo.Bar");
+ final String msg = "Async root logger msg with no location by default";
+ log.info(msg);
+ context.stop();
+ assertEquals(1, app.getEvents().size());
+ LogEvent event = app.getEvents().get(0);
+ assertFalse("includeLocation should be false", event.isIncludeLocation());
+ assertNull("Location data should not be present", event.getSource());
+ }
+}
diff --git a/log4j-core-test/src/test/resources/AsyncRootLoggerDefaultLocationTest.xml b/log4j-core-test/src/test/resources/AsyncRootLoggerDefaultLocationTest.xml
new file mode 100644
index 000000000..70f4ea67b
--- /dev/null
+++ b/log4j-core-test/src/test/resources/AsyncRootLoggerDefaultLocationTest.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ %d %p %c{1.} [%t] %X{aKey} %m %ex%n
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index 6fdca0233..d63dcf8b7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -319,7 +319,8 @@ public class AsyncLoggerConfig extends LoggerConfig {
LevelAndRefs container = LoggerConfig.getLevelAndRefs(getLevel(), getRefs(), getLevelAndRefs(),
getConfig());
return new AsyncLoggerConfig(LogManager.ROOT_LOGGER_NAME, container.refs, getFilter(), container.level,
- isAdditivity(), getProperties(), getConfig(), includeLocation(getIncludeLocation()));
+ isAdditivity(), getProperties(), getConfig(),
+ AsyncLoggerConfig.includeLocation(getIncludeLocation()));
}
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index efa047338..b94de7cdb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
+
+ Correct default to not include location for AsyncRootLoggers
+
Add LogEvent timestamp to ProducerRecord in KafkaAppender.