Fix refresh in undertow launcher

adrienlauer · adrienlauer · commit 715429a8f4cc · 2017-11-30T15:53:39.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 3.4.1 (2017-11-29)
+
+* [fix] Undertow-based applications would not refresh after a startup failure.
+
 # Version 3.4.0 (2017-11-28)
 
 * [new] Validation exceptions on REST resources are automatically mapped to a detailed response.
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/rest/core/pom.xml b/rest/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-core</artifactId>
diff --git a/rest/jersey2/pom.xml b/rest/jersey2/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey2</artifactId>
diff --git a/rest/pom.xml b/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest</artifactId>
diff --git a/rest/specs/pom.xml b/rest/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-specs</artifactId>
diff --git a/security/core/pom.xml b/security/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-security</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security-core</artifactId>
diff --git a/security/pom.xml b/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security</artifactId>
diff --git a/security/specs/pom.xml b/security/specs/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-security</artifactId>
-		<version>3.4.0-SNAPSHOT</version>
+		<version>3.4.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-security-specs</artifactId>
diff --git a/specs/pom.xml b/specs/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-specs</artifactId>
diff --git a/specs/src/main/java/org/seedstack/seed/spi/SeedLauncher.java b/specs/src/main/java/org/seedstack/seed/spi/SeedLauncher.java
@@ -28,7 +28,7 @@ public interface SeedLauncher {
      */
     void shutdown() throws Exception;
 
-    default void refresh() {
+    default void refresh() throws Exception {
         throw new UnsupportedOperationException("Refresh is not supported by this launcher");
     }
 }
diff --git a/testing/pom.xml b/testing/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-testing</artifactId>
diff --git a/web/core/pom.xml b/web/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-core</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web</artifactId>
diff --git a/web/security/pom.xml b/web/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-security</artifactId>
diff --git a/web/specs/pom.xml b/web/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-specs</artifactId>
diff --git a/web/undertow/pom.xml b/web/undertow/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-undertow</artifactId>
diff --git a/web/undertow/src/main/java/org/seedstack/seed/undertow/internal/UndertowLauncher.java b/web/undertow/src/main/java/org/seedstack/seed/undertow/internal/UndertowLauncher.java
@@ -12,13 +12,13 @@
 import io.nuun.kernel.api.Plugin;
 import io.undertow.Undertow;
 import io.undertow.servlet.api.DeploymentManager;
-import javax.servlet.ServletException;
 import org.seedstack.seed.SeedException;
 import org.seedstack.seed.core.Seed;
 import org.seedstack.seed.spi.SeedLauncher;
 import org.seedstack.seed.undertow.UndertowConfig;
 import org.seedstack.seed.web.WebConfig;
 import org.seedstack.seed.web.internal.ServletContextUtils;
+import org.seedstack.shed.exception.BaseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +37,6 @@ public void launch(String[] args) throws Exception {
 
         // Start the HTTP server
         start(serverConfig, undertowConfig);
-
     }
 
     @Override
@@ -47,60 +46,68 @@ public void shutdown() throws Exception {
     }
 
     @Override
-    public void refresh() {
+    public void refresh() throws Exception {
         LOGGER.info("Refreshing Web application");
-        if (undertow != null && deploymentManager != null) {
-            stop();
-            undeploy();
+        stop();
+        undeploy();
 
-            Seed.refresh();
+        Seed.refresh();
 
-            WebConfig.ServerConfig serverConfig = Seed.baseConfiguration().get(WebConfig.ServerConfig.class);
-            UndertowConfig undertowConfig = Seed.baseConfiguration().get(UndertowConfig.class);
+        WebConfig.ServerConfig serverConfig = Seed.baseConfiguration().get(WebConfig.ServerConfig.class);
+        UndertowConfig undertowConfig = Seed.baseConfiguration().get(UndertowConfig.class);
 
-            deploy(serverConfig);
-            start(serverConfig, undertowConfig);
-        }
+        deploy(serverConfig);
+        start(serverConfig, undertowConfig);
     }
 
-    private void deploy(WebConfig.ServerConfig serverConfig) {
-        DeploymentManagerFactory factory = new DeploymentManagerFactory(serverConfig);
-        deploymentManager = factory.createDeploymentManager();
-        deploymentManager.deploy();
+    private void deploy(WebConfig.ServerConfig serverConfig) throws Exception {
         try {
+            DeploymentManagerFactory factory = new DeploymentManagerFactory(serverConfig);
+            deploymentManager = factory.createDeploymentManager();
+            deploymentManager.deploy();
             deploymentManager.start();
-        } catch (ServletException e) {
-            LOGGER.error("An error occurred when trying to start the servlet context", e);
+        } catch (Exception e) {
+            handleUndertowException(e);
         }
     }
 
-    private void undeploy() {
+    private void undeploy() throws Exception {
         if (deploymentManager != null) {
             try {
                 deploymentManager.stop();
-            } catch (ServletException e) {
-                LOGGER.error("An error occurred when trying to stop the servlet context", e);
+                deploymentManager.undeploy();
+            } catch (Exception e) {
+                handleUndertowException(e);
+            } finally {
+                deploymentManager = null;
             }
-            deploymentManager.undeploy();
-            deploymentManager = null;
         }
     }
 
-    private void start(WebConfig.ServerConfig serverConfig, UndertowConfig undertowConfig) {
-        UndertowPlugin undertowPlugin = getUndertowPlugin(deploymentManager);
-        undertow = new ServerFactory(serverConfig, undertowConfig).createServer(
-                deploymentManager,
-                undertowPlugin.getSslProvider()
-        );
-        undertow.start();
-        LOGGER.info("Undertow Web server listening on {}:{}", serverConfig.getHost(), serverConfig.getPort());
+    private void start(WebConfig.ServerConfig serverConfig, UndertowConfig undertowConfig) throws Exception {
+        try {
+            UndertowPlugin undertowPlugin = getUndertowPlugin(deploymentManager);
+            undertow = new ServerFactory(serverConfig, undertowConfig).createServer(
+                    deploymentManager,
+                    undertowPlugin.getSslProvider()
+            );
+            undertow.start();
+            LOGGER.info("Undertow Web server listening on {}:{}", serverConfig.getHost(), serverConfig.getPort());
+        } catch (Exception e) {
+            handleUndertowException(e);
+        }
     }
 
-    private void stop() {
+    private void stop() throws Exception {
         if (undertow != null) {
-            undertow.stop();
-            LOGGER.info("Undertow Web server stopped");
-            undertow = null;
+            try {
+                undertow.stop();
+                LOGGER.info("Undertow Web server stopped");
+            } catch (Exception e) {
+                handleUndertowException(e);
+            } finally {
+                undertow = null;
+            }
         }
     }
 
@@ -114,4 +121,13 @@ private UndertowPlugin getUndertowPlugin(DeploymentManager deploymentManager) {
         }
         throw SeedException.createNew(UndertowErrorCode.MISSING_UNDERTOW_PLUGIN);
     }
+
+    private void handleUndertowException(Exception e) throws Exception {
+        // Undertow always wraps exception in a RuntimeException
+        if (e instanceof RuntimeException && e.getCause() instanceof BaseException) {
+            throw (BaseException) e.getCause();
+        } else {
+            throw e;
+        }
+    }
 }
