Merge pull request #4950 from stuartwdouglas/failed-restart-config

After failed start make sure to read the HTTP config with the correct TCCL
quarkusio · Oct 29, 2019 · 7312a80 · 7312a80
2 parents f90efa8 + 30ec90b
commit 7312a80
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java b/core/devmode/src/main/java/io/quarkus/dev/DevModeMain.java
@@ -96,10 +96,6 @@ public void start() throws Exception {
             if (context.isAbortOnFailedStart()) {
                 throw new RuntimeException(deploymentProblem == null ? compileProblem : deploymentProblem);
             }
-            log.error("Failed to start Quarkus, attempting to start hot replacement endpoint to recover");
-            if (runtimeUpdatesProcessor != null) {
-                runtimeUpdatesProcessor.startupFailed();
-            }
         }
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
             @Override
@@ -180,6 +176,20 @@ public void execute(BuildContext context) {
                 runner.run();
                 DevModeMain.runner = runner;
                 deploymentProblem = null;
+
+            } catch (Throwable t) {
+                deploymentProblem = t;
+                if (context.isAbortOnFailedStart() || liveReload) {
+                    log.error("Failed to start quarkus", t);
+                } else {
+                    //we need to set this here, while we still have the correct TCCL
+                    //this is so the config is still valid, and we can read HTTP config from application.properties
+                    log.error("Failed to start Quarkus, attempting to start hot replacement endpoint to recover");
+                    if (runtimeUpdatesProcessor != null) {
+                        runtimeUpdatesProcessor.startupFailed();
+                    }
+                }
+
             } finally {
                 Thread.currentThread().setContextClassLoader(old);
             }