Remove Old Dev UI Logstream WebSocket

Signed-off-by: Phillip Kruger <[email protected]>
DavideD · Nov 27, 2023 · 8f37b47 · 8f37b47
1 parent 1dd4d8f
commit 8f37b47
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 60 deletions.
diff --git a/...eployment/src/main/java/io/quarkus/deployment/builditem/WebSocketLogHandlerBuildItem.java b/...eployment/src/main/java/io/quarkus/deployment/builditem/WebSocketLogHandlerBuildItem.java
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
@@ -72,7 +72,6 @@
 import io.quarkus.deployment.builditem.ShutdownListenerBuildItem;
 import io.quarkus.deployment.builditem.StreamingLogHandlerBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
-import io.quarkus.deployment.builditem.WebSocketLogHandlerBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
@@ -229,7 +228,6 @@ LoggingSetupBuildItem setupLoggingRuntimeInit(RecorderContext context, LoggingSe
             CombinedIndexBuildItem combinedIndexBuildItem,
             LogCategoryMinLevelDefaultsBuildItem categoryMinLevelDefaults,
             Optional<StreamingLogHandlerBuildItem> streamingLogStreamHandlerBuildItem,
-            Optional<WebSocketLogHandlerBuildItem> wsLogStreamHandlerBuildItem,
             List<LogHandlerBuildItem> handlerBuildItems,
             List<NamedLogHandlersBuildItem> namedHandlerBuildItems,
             List<LogConsoleFormatBuildItem> consoleFormatItems,
@@ -258,11 +256,6 @@ LoggingSetupBuildItem setupLoggingRuntimeInit(RecorderContext context, LoggingSe
             if (bannerBuildItem != null) {
                 possibleSupplier = bannerBuildItem.getBannerSupplier();
             }
-            // Old Dev UI Log Stream
-            RuntimeValue<Optional<Handler>> wsDevUiLogHandler = null;
-            if (wsLogStreamHandlerBuildItem.isPresent()) {
-                wsDevUiLogHandler = wsLogStreamHandlerBuildItem.get().getHandlerValue();
-            }
 
             // New Dev UI Log Stream
             RuntimeValue<Optional<Handler>> streamingDevUiLogHandler = null;
@@ -297,7 +290,7 @@ LoggingSetupBuildItem setupLoggingRuntimeInit(RecorderContext context, LoggingSe
             shutdownListenerBuildItemBuildProducer.produce(new ShutdownListenerBuildItem(
                     recorder.initializeLogging(log, buildLog, discoveredLogComponents,
                             categoryMinLevelDefaults.content, alwaysEnableLogStream,
-                            wsDevUiLogHandler, streamingDevUiLogHandler, handlers, namedHandlers,
+                            streamingDevUiLogHandler, handlers, namedHandlers,
                             possibleConsoleFormatters, possibleFileFormatters, possibleSyslogFormatters,
                             possibleSupplier, launchModeBuildItem.getLaunchMode(), true)));
             LogConfig logConfig = new LogConfig();

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
@@ -80,7 +80,7 @@ public static void handleFailedStart(RuntimeValue<Optional<Supplier<String>>> ba
         new LoggingSetupRecorder(new RuntimeValue<>(consoleRuntimeConfig)).initializeLogging(config, buildConfig,
                 DiscoveredLogComponents.ofEmpty(),
                 Collections.emptyMap(),
-                false, null, null,
+                false, null,
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
@@ -92,7 +92,6 @@ public ShutdownListener initializeLogging(LogConfig config, LogBuildTimeConfig b
             DiscoveredLogComponents discoveredLogComponents,
             final Map<String, InheritableLevel> categoryDefaultMinLevels,
             final boolean enableWebStream,
-            final RuntimeValue<Optional<Handler>> wsDevUiConsoleHandler,
             final RuntimeValue<Optional<Handler>> streamingDevUiConsoleHandler,
             final List<RuntimeValue<Optional<Handler>>> additionalHandlers,
             final List<RuntimeValue<Map<String, Handler>>> additionalNamedHandlers,
@@ -184,22 +183,6 @@ public void close() throws SecurityException {
         }
 
         if ((launchMode.isDevOrTest() || enableWebStream)
-                && wsDevUiConsoleHandler != null
-                && wsDevUiConsoleHandler.getValue().isPresent()) {
-
-            Handler handler = wsDevUiConsoleHandler.getValue().get();
-            handler.setErrorManager(errorManager);
-            handler.setFilter(new LogCleanupFilter(filterElements, shutdownNotifier));
-
-            if (possibleBannerSupplier != null && possibleBannerSupplier.getValue().isPresent()) {
-                Supplier<String> bannerSupplier = possibleBannerSupplier.getValue().get();
-                String header = "\n" + bannerSupplier.get();
-                handler.publish(new LogRecord(Level.INFO, header));
-            }
-            handlers.add(handler);
-        }
-
-        if ((launchMode.isDevOrTest())
                 && streamingDevUiConsoleHandler != null
                 && streamingDevUiConsoleHandler.getValue().isPresent()) {