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 2020/02/09 02:55:12 UTC
[logging-log4j2] branch master updated: Fixed check for
RollingFileManager, directWrite (#331)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 72c548a Fixed check for RollingFileManager,directWrite (#331)
72c548a is described below
commit 72c548a56c80bd7d8fdf111c2a7143937926414c
Author: ChristophKaser <Ch...@users.noreply.github.com>
AuthorDate: Sun Feb 9 03:55:02 2020 +0100
Fixed check for RollingFileManager,directWrite (#331)
* LOG4J2-2758: Fixed check for RollingFileManager.directWrite
Bugfix: Use the interface DirectFileRolloverStrategy instead of the concrete implementation DirectWriteRolloverStrategy when deciding whether to use the pattern to generate a file name.
* LOG4J2-2758: Added test for RollingFileManager with custom DirectFileRolloverStrategy
---
.../core/appender/rolling/RollingFileManager.java | 2 +-
.../appender/rolling/RollingFileManagerTest.java | 87 ++++++++++++++++++++++
2 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 7cc82b2..e68fc1c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -104,7 +104,7 @@ public class RollingFileManager extends FileManager {
this.patternProcessor = new PatternProcessor(pattern);
this.patternProcessor.setPrevFileTime(initialTime);
this.fileName = fileName;
- this.directWrite = rolloverStrategy instanceof DirectWriteRolloverStrategy;
+ this.directWrite = rolloverStrategy instanceof DirectFileRolloverStrategy;
this.fileExtension = FileExtension.lookupForFile(pattern);
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java
new file mode 100644
index 0000000..9619a18
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManagerTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.LoggerContext;
+import org.apache.logging.log4j.core.appender.RollingFileAppender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.lookup.StrSubstitutor;
+import org.apache.logging.log4j.core.util.IOUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+public class RollingFileManagerTest {
+
+ /**
+ * Test the RollingFileManager with a custom DirectFileRolloverStrategy
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testCustomDirectFileRolloverStrategy() throws IOException {
+ class CustomDirectFileRolloverStrategy extends AbstractRolloverStrategy implements DirectFileRolloverStrategy {
+ final File file;
+
+ CustomDirectFileRolloverStrategy(File file, StrSubstitutor strSubstitutor) {
+ super(strSubstitutor);
+ this.file = file;
+ }
+
+ @Override
+ public String getCurrentFileName(RollingFileManager manager) {
+ return file.getAbsolutePath();
+ }
+
+ @Override
+ public void clearCurrentFileName() {
+ // do nothing
+ }
+
+ @Override
+ public RolloverDescription rollover(RollingFileManager manager) throws SecurityException {
+ return null; // do nothing
+ }
+ }
+
+ try (final LoggerContext ctx = LoggerContext.getContext(false)) {
+ final Configuration config = ctx.getConfiguration();
+ final File file = File.createTempFile("RollingFileAppenderAccessTest", ".tmp");
+ file.deleteOnExit();
+
+ final RollingFileAppender appender = RollingFileAppender.newBuilder()
+ .setFilePattern("FilePattern")
+ .setName("RollingFileAppender")
+ .setConfiguration(config)
+ .setStrategy(new CustomDirectFileRolloverStrategy(file, config.getStrSubstitutor()))
+ .setPolicy(new SizeBasedTriggeringPolicy(100))
+ .build();
+
+ Assert.assertNotNull(appender);
+ final String testContent = "Test";
+ try(final RollingFileManager manager = appender.getManager()) {
+ Assert.assertEquals(file.getAbsolutePath(), manager.getFileName());
+ manager.writeToDestination(testContent.getBytes(StandardCharsets.US_ASCII), 0, testContent.length());
+ }
+ try (final Reader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.US_ASCII)) {
+ Assert.assertEquals(testContent, IOUtils.toString(reader));
+ }
+ }
+ }
+}