Stop/destroy the connector and context

earldouglas · Sep 27, 2024 · 069e6f1 · 069e6f1
1 parent 7b3a874
commit 069e6f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/scala/com/earldouglas/sbt/war/WebappComponentsRunner.scala b/src/main/scala/com/earldouglas/sbt/war/WebappComponentsRunner.scala
@@ -113,7 +113,13 @@ object WebappComponentsRunner {
       override def start(): Unit = tomcat.start()
       override def join(): Unit = tomcat.getServer().await()
       override def stop(): Unit = {
+
+        connector.stop()
+        context.stop()
         tomcat.stop()
+
+        connector.destroy()
+        context.destroy()
         tomcat.destroy()
       }
     }

diff --git a/src/main/scala/com/earldouglas/sbt/war/WebappComponentsRunnerPlugin.scala b/src/main/scala/com/earldouglas/sbt/war/WebappComponentsRunnerPlugin.scala
@@ -39,8 +39,8 @@ object WebappComponentsRunnerPlugin extends AutoPlugin {
       val runner: WebappComponentsRunner =
         WebappComponentsRunner(
           hostname = "localhost", // TODO this could be a settingKey
-          contextPath = "", // TODO this could be a settingKey
           port = webappPort.value,
+          contextPath = "", // TODO this could be a settingKey
           emptyWebappDir = emptyDir,
           emptyClassesDir = emptyDir,
           resourceMap = WebappComponentsPlugin.webappContents.value