Slightly improved error handling

propensive · Dec 8, 2024 · 4e3cdf0 · 4e3cdf0
1 parent a3e4df2
commit 4e3cdf0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/server/scintillate.HttpServer.scala b/src/server/scintillate.HttpServer.scala
@@ -77,7 +77,7 @@ case class HttpServer(port: Int)(using Tactic[ServerError]) extends RequestServa
     val cancel: Promise[Unit] = Promise[Unit]()
     val server = startServer()
 
-    val asyncTask = async(cancel.await() yet server.stop(1))
+    val asyncTask = async(cancel.attend() yet server.stop(1))
 
     HttpService(port, asyncTask, () => safely(cancel.fulfill(())))
 

diff --git a/src/servlet/.scintillate.JavaServlet.scala.swp b/src/servlet/.scintillate.JavaServlet.scala.swp
diff --git a/src/servlet/scintillate.JavaServlet.scala b/src/servlet/scintillate.JavaServlet.scala
@@ -77,9 +77,12 @@ open class JavaServlet(handle: HttpConnection ?=> HttpResponse) extends jsh.Http
     HttpConnection(false, request.getServerPort, httpRequest, respond)
 
   def handle(request: jsh.HttpServletRequest, response: jsh.HttpServletResponse): Unit =
-    safely:
+    unsafely:
       val connection = makeConnection(request, response)
       connection.respond(handle(using connection))
 
   override def service(request: jsh.HttpServletRequest, response: jsh.HttpServletResponse): Unit =
-    handle(request, response)
+    try handle(request, response) catch
+      case error: Throwable =>
+        println("An error occurred while processing a request: "+error)
+        error.printStackTrace(System.out)