From 339ced51acb3ac5a3736a54a52a4ebf00b8cc0d3 Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Thu, 21 Apr 2022 16:46:44 +0200
Subject: [PATCH] Logging - set default value for
 quarkus.log.file.rotation.max-file-size

- also change the default value for
quarkus.log.file.rotation.max-backup-index
---
 .../io/quarkus/runtime/logging/FileConfig.java  |  6 +++---
 .../runtime/logging/LoggingSetupRecorder.java   | 17 +++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/FileConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/FileConfig.java
index 78bcdb7c7368c9..5e9b9239daa78e 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/FileConfig.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/FileConfig.java
@@ -58,13 +58,13 @@ public static class RotationConfig {
         /**
          * The maximum file size of the log file after which a rotation is executed.
          */
-        @ConfigItem(defaultValueDocumentation = "10")
-        Optional<MemorySize> maxFileSize;
+        @ConfigItem(defaultValue = "10M")
+        MemorySize maxFileSize;
 
         /**
          * The maximum number of backups to keep.
          */
-        @ConfigItem(defaultValue = "1")
+        @ConfigItem(defaultValue = "5")
         int maxBackupIndex;
 
         /**
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
index 3e2affb05babde..4a17b72e49e09f 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
@@ -33,7 +33,6 @@
 import org.jboss.logmanager.handlers.AsyncHandler;
 import org.jboss.logmanager.handlers.ConsoleHandler;
 import org.jboss.logmanager.handlers.FileHandler;
-import org.jboss.logmanager.handlers.PeriodicRotatingFileHandler;
 import org.jboss.logmanager.handlers.PeriodicSizeRotatingFileHandler;
 import org.jboss.logmanager.handlers.SizeRotatingFileHandler;
 import org.jboss.logmanager.handlers.SyslogHandler;
@@ -470,26 +469,20 @@ public void close() throws SecurityException {
 
     private static Handler configureFileHandler(final FileConfig config, final ErrorManager errorManager,
             final LogCleanupFilter cleanupFilter) {
-        FileHandler handler = new FileHandler();
+        FileHandler handler;
         FileConfig.RotationConfig rotationConfig = config.rotation;
-        if ((rotationConfig.maxFileSize.isPresent() || rotationConfig.rotateOnBoot)
-                && rotationConfig.fileSuffix.isPresent()) {
+        if (rotationConfig.fileSuffix.isPresent()) {
             PeriodicSizeRotatingFileHandler periodicSizeRotatingFileHandler = new PeriodicSizeRotatingFileHandler();
             periodicSizeRotatingFileHandler.setSuffix(rotationConfig.fileSuffix.get());
-            rotationConfig.maxFileSize
-                    .ifPresent(memorySize -> periodicSizeRotatingFileHandler.setRotateSize(memorySize.asLongValue()));
+            periodicSizeRotatingFileHandler.setRotateSize(rotationConfig.maxFileSize.asLongValue());
             periodicSizeRotatingFileHandler.setRotateOnBoot(rotationConfig.rotateOnBoot);
             periodicSizeRotatingFileHandler.setMaxBackupIndex(rotationConfig.maxBackupIndex);
             handler = periodicSizeRotatingFileHandler;
-        } else if (rotationConfig.maxFileSize.isPresent()) {
+        } else {
             SizeRotatingFileHandler sizeRotatingFileHandler = new SizeRotatingFileHandler(
-                    rotationConfig.maxFileSize.get().asLongValue(), rotationConfig.maxBackupIndex);
+                    rotationConfig.maxFileSize.asLongValue(), rotationConfig.maxBackupIndex);
             sizeRotatingFileHandler.setRotateOnBoot(rotationConfig.rotateOnBoot);
             handler = sizeRotatingFileHandler;
-        } else if (rotationConfig.fileSuffix.isPresent()) {
-            PeriodicRotatingFileHandler periodicRotatingFileHandler = new PeriodicRotatingFileHandler();
-            periodicRotatingFileHandler.setSuffix(rotationConfig.fileSuffix.get());
-            handler = periodicRotatingFileHandler;
         }
 
         final PatternFormatter formatter = new PatternFormatter(config.format);