Merge pull request #17914 from geoand/#17913

Take 'enable' field into account for named logging handlers
quarkusio · Jun 15, 2021 · 99fbfab · 99fbfab
2 parents 282766a + aab9c77
commit 99fbfab
Showing 1 changed file with 15 additions and 3 deletions.
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
@@ -253,16 +253,28 @@ private static Map<String, Handler> createNamedHandlers(LogConfig config,
             List<LogCleanupFilterElement> filterElements) {
         Map<String, Handler> namedHandlers = new HashMap<>();
         for (Entry<String, ConsoleConfig> consoleConfigEntry : config.consoleHandlers.entrySet()) {
-            final Handler consoleHandler = configureConsoleHandler(consoleConfigEntry.getValue(), errorManager, filterElements,
+            ConsoleConfig namedConsoleConfig = consoleConfigEntry.getValue();
+            if (!namedConsoleConfig.enable) {
+                continue;
+            }
+            final Handler consoleHandler = configureConsoleHandler(namedConsoleConfig, errorManager, filterElements,
                     possibleFormatters, null);
             addToNamedHandlers(namedHandlers, consoleHandler, consoleConfigEntry.getKey());
         }
         for (Entry<String, FileConfig> fileConfigEntry : config.fileHandlers.entrySet()) {
-            final Handler fileHandler = configureFileHandler(fileConfigEntry.getValue(), errorManager, filterElements);
+            FileConfig namedFileConfig = fileConfigEntry.getValue();
+            if (!namedFileConfig.enable) {
+                continue;
+            }
+            final Handler fileHandler = configureFileHandler(namedFileConfig, errorManager, filterElements);
             addToNamedHandlers(namedHandlers, fileHandler, fileConfigEntry.getKey());
         }
         for (Entry<String, SyslogConfig> sysLogConfigEntry : config.syslogHandlers.entrySet()) {
-            final Handler syslogHandler = configureSyslogHandler(sysLogConfigEntry.getValue(), errorManager, filterElements);
+            SyslogConfig namedSyslogConfig = sysLogConfigEntry.getValue();
+            if (!namedSyslogConfig.enable) {
+                continue;
+            }
+            final Handler syslogHandler = configureSyslogHandler(namedSyslogConfig, errorManager, filterElements);
             if (syslogHandler != null) {
                 addToNamedHandlers(namedHandlers, syslogHandler, sysLogConfigEntry.getKey());
             }