Merge pull request #19072 from stuartwdouglas/logging-on-failure

Don't setup logging on failure in dev mode
quarkusio · Jul 30, 2021 · 4d1c40f · 4d1c40f
2 parents c378694 + 8ed5852
commit 4d1c40f
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
@@ -298,17 +298,23 @@ void build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
         cb = tryBlock.addCatch(Throwable.class);
 
         // an exception was thrown before logging was actually setup, we simply dump everything to the console
-        ResultHandle delayedHandler = cb
-                .readStaticField(FieldDescriptor.of(InitialConfigurator.class, "DELAYED_HANDLER", QuarkusDelayedHandler.class));
-        ResultHandle isActivated = cb.invokeVirtualMethod(ofMethod(QuarkusDelayedHandler.class, "isActivated", boolean.class),
-                delayedHandler);
-        BytecodeCreator isActivatedFalse = cb.ifNonZero(isActivated).falseBranch();
-        ResultHandle handlersArray = isActivatedFalse.newArray(Handler.class, 1);
-        isActivatedFalse.writeArrayValue(handlersArray, 0, isActivatedFalse.newInstance(ofConstructor(ConsoleHandler.class)));
-        isActivatedFalse.invokeVirtualMethod(
-                ofMethod(QuarkusDelayedHandler.class, "setHandlers", Handler[].class, Handler[].class),
-                delayedHandler, handlersArray);
-        isActivatedFalse.breakScope();
+        // we don't do this for dev mode, as on startup failure dev mode sets up its own logging
+        if (launchMode.getLaunchMode() != LaunchMode.DEVELOPMENT) {
+            ResultHandle delayedHandler = cb
+                    .readStaticField(
+                            FieldDescriptor.of(InitialConfigurator.class, "DELAYED_HANDLER", QuarkusDelayedHandler.class));
+            ResultHandle isActivated = cb.invokeVirtualMethod(
+                    ofMethod(QuarkusDelayedHandler.class, "isActivated", boolean.class),
+                    delayedHandler);
+            BytecodeCreator isActivatedFalse = cb.ifNonZero(isActivated).falseBranch();
+            ResultHandle handlersArray = isActivatedFalse.newArray(Handler.class, 1);
+            isActivatedFalse.writeArrayValue(handlersArray, 0,
+                    isActivatedFalse.newInstance(ofConstructor(ConsoleHandler.class)));
+            isActivatedFalse.invokeVirtualMethod(
+                    ofMethod(QuarkusDelayedHandler.class, "setHandlers", Handler[].class, Handler[].class),
+                    delayedHandler, handlersArray);
+            isActivatedFalse.breakScope();
+        }
 
         cb.invokeVirtualMethod(ofMethod(StartupContext.class, "close", void.class), startupContext);
         cb.throwException(RuntimeException.class, "Failed to start quarkus", cb.getCaughtException());