Moved configuring of ConsoleAppender to AppenderUtils

Author: Hakky54

src/main/java/nl/altindag/log/LogCaptor.java

@@ -18,7 +18,6 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.filter.Filter;
 import nl.altindag.log.appender.InMemoryAppender;
@@ -30,7 +29,6 @@
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -59,39 +57,10 @@ public final class LogCaptor implements AutoCloseable {
     private LogCaptor(String loggerName) {
         logger = LogbackUtils.getLogger(loggerName);
         inMemoryAppender = AppenderUtils.configureInMemoryAppender(logger, eventsCollector);
+        consoleAppender = AppenderUtils.configureConsoleAppender(logger);
 
         JavaUtilLoggingLoggerUtils.redirectToSlf4j(loggerName);
         logLevelContainer.putIfAbsent(logger.getName(), logger.getEffectiveLevel());
-
-        configureConsoleAppender(loggerName);
-    }
-
-    private void configureConsoleAppender(String loggerName) {
-        if (!ROOT_LOGGER_NAME.equals(loggerName)) {
-            logger.setAdditive(false);
-        }
-
-        consoleAppender = createConsoleAppender();
-        if (!ROOT_LOGGER_NAME.equals(loggerName)) {
-            boolean containsRootConsoleAppender = false;
-            Iterator<Appender<ILoggingEvent>> rootAppenders = getRootLogger().iteratorForAppenders();
-            while (rootAppenders.hasNext()) {
-                if (rootAppenders.next() instanceof ConsoleAppender) {
-                    containsRootConsoleAppender = true;
-                }
-            }
-
-            if (containsRootConsoleAppender) {
-                logger.addAppender(consoleAppender);
-            }
-        }
-    }
-
-    private ConsoleAppender<ILoggingEvent> createConsoleAppender() {
-        return Optional.ofNullable(consoleAppender)
-                .orElseGet(() -> AppenderUtils.getConsoleAppender(getRootLogger())
-                .orElseGet(() -> AppenderUtils.getConsoleAppender(logger)
-                .orElseGet(() -> AppenderUtils.createConsoleAppender(logger.getLoggerContext()))));
     }
 
     /**
@@ -282,7 +251,7 @@ public void reconfigure() {
         StreamSupport.stream(Spliterators.spliteratorUnknownSize(logger.iteratorForAppenders(), Spliterator.ORDERED), false)
                 .forEach(logger::detachAppender);
 
-        configureConsoleAppender(logger.getName());
+        consoleAppender = AppenderUtils.configureConsoleAppender(logger);
         logger.addAppender(inMemoryAppender);
         logger.addAppender(consoleAppender);
         inMemoryAppender.start();

src/main/java/nl/altindag/log/util/AppenderUtils.java

@@ -19,15 +19,19 @@
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.encoder.Encoder;
 import nl.altindag.log.appender.InMemoryAppender;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
+import static org.slf4j.Logger.ROOT_LOGGER_NAME;
+
 public final class AppenderUtils {
 
     public static final String CONSOLE_APPENDER_NAME = "console";
@@ -73,4 +77,38 @@ public static InMemoryAppender<ILoggingEvent> configureInMemoryAppender(Logger l
         return inMemoryAppender;
     }
 
+    public static ConsoleAppender<ILoggingEvent> configureConsoleAppender(Logger logger) {
+        String loggerName = logger.getName();
+        if (!ROOT_LOGGER_NAME.equals(loggerName)) {
+            logger.setAdditive(false);
+        }
+
+        ConsoleAppender<ILoggingEvent> consoleAppender = createConsoleAppender(logger, null);
+        if (!ROOT_LOGGER_NAME.equals(loggerName)) {
+            boolean containsRootConsoleAppender = false;
+            Iterator<Appender<ILoggingEvent>> rootAppenders = getRootLogger(logger).iteratorForAppenders();
+            while (rootAppenders.hasNext()) {
+                if (rootAppenders.next() instanceof ConsoleAppender) {
+                    containsRootConsoleAppender = true;
+                }
+            }
+
+            if (containsRootConsoleAppender) {
+                logger.addAppender(consoleAppender);
+            }
+        }
+        return consoleAppender;
+    }
+
+    private static ConsoleAppender<ILoggingEvent> createConsoleAppender(Logger logger, ConsoleAppender<ILoggingEvent> consoleAppender) {
+        return Optional.ofNullable(consoleAppender)
+                .orElseGet(() -> AppenderUtils.getConsoleAppender(getRootLogger(logger))
+                .orElseGet(() -> AppenderUtils.getConsoleAppender(logger)
+                .orElseGet(() -> AppenderUtils.createConsoleAppender(logger.getLoggerContext()))));
+    }
+
+    private static Logger getRootLogger(Logger logger) {
+        return logger.getLoggerContext().getLogger(ROOT_LOGGER_NAME);
+    }
+
 }