COMMANDBOX-1391

gradle/version

@@ -1 +1 @@
-5.0.9-0de55e3b7a2f4c8dd5b33ef11edc7a90a39506e7-96ea216b7cfb6883a6af15c191a94953a0596b9c
+5.1.0-aa351631ef382d87ae99aa3226f207395a0a67c3-5df020e780b029afb9d6f1049e4527dc95d94f72

src/main/java/runwar/Server.java

@@ -55,6 +55,7 @@
 import runwar.undertow.SSLCertHeaderHandler;
 import runwar.undertow.SiteDeployment;
 import runwar.undertow.SiteDeploymentManager;
+import runwar.undertow.handler.WarmUpServer;
 import runwar.util.ClassLoaderUtils;
 import runwar.util.Utils;
 
@@ -426,6 +427,9 @@ public HttpHandler wrap(HttpHandler next) {
 
             undertow.start();
 
+            LOG.trace("Firing any warmup handlers");
+            WarmUpServer.triggerWarmups();
+
         } catch (Exception any) {
             if (any.getCause() instanceof java.net.SocketException
                     && any.getCause().getMessage().equals("Permission denied")) {

src/main/java/runwar/undertow/SiteDeployment.java

@@ -57,6 +57,7 @@
 import runwar.undertow.SSLCertHeaderHandler;
 import runwar.undertow.LifecyleHandler;
 import runwar.undertow.WelcomeFileHandler;
+import runwar.undertow.handler.WarmUpServer;
 import runwar.util.ClassLoaderUtils;
 import runwar.util.RequestDumper;
 import runwar.Server;
@@ -69,9 +70,9 @@
 import java.net.*;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.*;
+import java.util.List;
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequest;
@@ -118,6 +119,10 @@ public SiteDeployment(HttpHandler servletInitialHandler, DeploymentManager deplo
     private HttpHandler buildSiteHandlerChain(HttpHandler servletInitialHandler, ServerOptions serverOptions)
             throws Exception {
 
+        // Used to provide a hint to each warmup handler instance what site name it is
+        // part of
+        WarmUpServer.currentSiteName = siteOptions.siteName();
+
         final PathHandler pathHandler = new PathHandler(Handlers.redirect(serverOptions.contextPath())) {
             private final HttpString HTTPONLY = new HttpString("HttpOnly");
             private final HttpString SECURE = new HttpString("Secure");