Logging > Register our TurboFilter only once. During the HiveMQ start…

… we load our logback.xml which will reset the current context and call the reset which will register the TurboFilter a second time.
hivemq · Nov 9, 2023 · ece17be · ece17be
1 parent 9b2bcc9
commit ece17be
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/hivemq-edge/src/main/java/com/hivemq/HiveMQEdgeMain.java b/hivemq-edge/src/main/java/com/hivemq/HiveMQEdgeMain.java
@@ -146,6 +146,8 @@ protected void stopGateway() {
 
         //Stop the API Webserver
         stopApiServer();
+
+        LoggingBootstrap.resetLogging();
     }
 
     protected void initializeApiServer(@NotNull final Injector injector) {

diff --git a/hivemq-edge/src/main/java/com/hivemq/bootstrap/LoggingBootstrap.java b/hivemq-edge/src/main/java/com/hivemq/bootstrap/LoggingBootstrap.java
@@ -50,6 +50,7 @@ public class LoggingBootstrap {
     private static final List<Appender<ILoggingEvent>> defaultAppenders = new LinkedList<>();
     private static final @NotNull LogLevelModifierTurboFilter logLevelModifierTurboFilter =
             new LogLevelModifierTurboFilter();
+    private static final @NotNull LogbackChangeListener logbackChangeListener = new LogbackChangeListener();
 
     /**
      * Prepares the logging. This method must be called before any logging occurs
@@ -83,12 +84,13 @@ public static void initLogging(final @NotNull File configFolder) {
 
         final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
 
-        context.addListener(new LogbackChangeListener());
+        context.addListener(logbackChangeListener);
 
         final boolean overridden = overrideLogbackXml(configFolder);
 
         if (!overridden) {
             reEnableDefaultAppenders();
+            context.addTurboFilter(logLevelModifierTurboFilter);
         }
         redirectJULToSLF4J();
         logQueuedEntries();
@@ -100,6 +102,12 @@ public static void initLogging(final @NotNull File configFolder) {
         log.trace("Added Netty log level modifier");
     }
 
+    public static void resetLogging() {
+        final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
+        context.getTurboFilterList().remove(logLevelModifierTurboFilter);
+        context.removeListener(logbackChangeListener);
+    }
+
     /**
      * Re-enables all default appenders that were removed from the root logger for startup
      */