You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2022/08/04 19:37:32 UTC
[logging-log4j2] branch release-2.x updated: [LOG4J2-3565] Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 28efddbcd5 [LOG4J2-3565] Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory.
28efddbcd5 is described below
commit 28efddbcd5fd9f83ea299d099a15dffbae9696a5
Author: dafengsu7 <da...@gmail.com>
AuthorDate: Thu Aug 4 01:26:09 2022 +0800
[LOG4J2-3565] Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory.
---
.../rolling/RollingRandomAccessFileManager.java | 10 ++---
...omAppenderDirectWriteAndSwitchDirectorTest.java | 48 +++++++++++++++++++++
...log4j-rolling-random-direct-switch-director.xml | 49 ++++++++++++++++++++++
src/changes/changes.xml | 3 ++
4 files changed, 105 insertions(+), 5 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index 30d797e066..fa3e976049 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -139,10 +139,7 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
protected synchronized void writeToDestination(final byte[] bytes, final int offset, final int length) {
try {
if (randomAccessFile == null) {
- final String fileName = getFileName();
- final File file = new File(fileName);
- FileUtils.makeParentDirs(file);
- createFileAfterRollover(fileName);
+ createFileAfterRollover();
}
randomAccessFile.write(bytes, offset, length);
size += length;
@@ -154,7 +151,10 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
@Override
protected void createFileAfterRollover() throws IOException {
- createFileAfterRollover(getFileName());
+ final String fileName = getFileName();
+ final File file = new File(fileName);
+ FileUtils.makeParentDirs(file);
+ createFileAfterRollover(fileName);
}
private void createFileAfterRollover(final String fileName) throws IOException {
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAppenderDirectWriteAndSwitchDirectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAppenderDirectWriteAndSwitchDirectorTest.java
new file mode 100644
index 0000000000..942cee855a
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAppenderDirectWriteAndSwitchDirectorTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.appender.rolling;
+
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.junit.CleanUpDirectories;
+import org.apache.logging.log4j.junit.LoggerContextSource;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.time.LocalTime;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@CleanUpDirectories(RollingRandomAppenderDirectWriteAndSwitchDirectorTest.DIR)
+public class RollingRandomAppenderDirectWriteAndSwitchDirectorTest {
+ public static final String DIR = "target/rolling-random-direct-switch-director";
+ @Test
+ @LoggerContextSource(value= "log4j-rolling-random-direct-switch-director.xml", timeout = 10)
+ public void testAppender(final LoggerContext context) throws Exception {
+ Logger logger = context.getLogger(RollingRandomAppenderDirectWriteAndSwitchDirectorTest.class.getName());
+ LocalTime start = LocalTime.now();
+ LocalTime end;
+ do {
+ end = LocalTime.now();
+ logger.info("test log");
+ Thread.sleep(100);
+ } while (start.getSecond() == end.getSecond());
+
+ File nextLogFile = new File(String.format("%s/%d/%d.log", DIR, end.getSecond(), end.getSecond()));
+ assertTrue(nextLogFile.exists(), "nextLogFile not created");
+ }
+}
diff --git a/log4j-core/src/test/resources/log4j-rolling-random-direct-switch-director.xml b/log4j-core/src/test/resources/log4j-rolling-random-direct-switch-director.xml
new file mode 100644
index 0000000000..bc07b1ca14
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-rolling-random-direct-switch-director.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<Configuration status="WARN" name="XMLConfigTest">
+ <Properties>
+ <Property name="LOG_HEADER">start log4j-rolling-random-direct-switch-director test</Property>
+ <Property name="LOG_PATTERN">%d %p %C{1.} [%t] %m%n</Property>
+ <Property name="baseDir">target/rolling-random-direct-switch-director</Property>
+ </Properties>
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT" follow="true">
+ <PatternLayout header= "${LOG_HEADER}">
+ <Pattern>${LOG_PATTERN}</Pattern>
+ </PatternLayout>
+ </Console>
+ <RollingRandomAccessFile name="RollingFile" filePattern="${baseDir}/%d{s}/%d{s}.log">
+ <PatternLayout header= "${LOG_HEADER}">
+ <Pattern>${LOG_PATTERN}</Pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy/>
+ </Policies>
+ </RollingRandomAccessFile>
+ </Appenders>
+
+ <Loggers>
+ <Logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false">
+ <AppenderRef ref="RollingFile"/>
+ </Logger>>
+ <Root level="error">
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f0b59cd8e..de42842d74 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,6 +42,9 @@
<action issue="LOG4J2-3564" dev="pkarwasz" type="fix">
Fix NPE in `log4j-to-jul` in the case the root logger level is null.
</action>
+ <action issue="LOG4J2-3565" dev="dafengsu7" type="fix">
+ Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory.
+ </action>
</release>
<release version="2.18.0" date="2022-06-28" description="GA Release 2.18.0">
<action issue="LOG4J2-3339" dev="rgoers" type="fix">