fix some more Resource.allocated code

softwaremill · Nov 25, 2024 · 95167a1 · 95167a1
1 parent cd1ce53
commit 95167a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/perf-tests/src/main/scala/sttp/tapir/perf/http4s/Http4s.scala b/perf-tests/src/main/scala/sttp/tapir/perf/http4s/Http4s.scala
@@ -109,17 +109,17 @@ object server {
   def runServer(
       router: WebSocketBuilder2[IO] => HttpRoutes[IO]
   ): IO[ServerRunner.KillSwitch] =
-    EmberServerBuilder
-      .default[IO]
-      .withPort(ip4s.Port.fromInt(Port).get)
-      .withHttpWebSocketApp(wsb => router(wsb).orNotFound)
-      .withMaxConnections(maxConnections)
-      .build
-      .allocated
-      .map(_._2)
-      .map(_.flatTap { _ =>
-        IO.println("Http4s server closed.")
-      })
+    Resource.eval(Deferred[IO, Unit]).flatMap { stopSignal =>
+        EmberServerBuilder
+          .default[IO]
+          .withPort(ip4s.Port.fromInt(Port).get)
+          .withHttpWebSocketApp(wsb => router(wsb).orNotFound)
+          .withMaxConnections(maxConnections)
+          .build
+          .use(_ => stopSignal.get *> IO.println("Http4s server closed."))
+          .background
+          .as(stopSignal.complete(()))
+    }
 }
 
 object TapirServer extends ServerRunner { override def start = server.runServer(Tapir.router(1)) }

diff --git a/server/tests/src/main/scala/sttp/tapir/server/tests/TestServerInterpreter.scala b/server/tests/src/main/scala/sttp/tapir/server/tests/TestServerInterpreter.scala
@@ -1,10 +1,11 @@
 package sttp.tapir.server.tests
 
 import cats.data.NonEmptyList
+import cats.effect.Deferred
 import cats.effect.{IO, Resource}
 import sttp.tapir.server.ServerEndpoint
 import sttp.tapir.server.interceptor.CustomiseInterceptors
-import sttp.tapir.tests._
+import sttp.tapir.tests.*
 
 import scala.concurrent.duration.FiniteDuration
 
@@ -21,8 +22,12 @@ trait TestServerInterpreter[F[_], +R, OPTIONS, ROUTE] {
   def serverWithStop(
       routes: NonEmptyList[ROUTE],
       gracefulShutdownTimeout: Option[FiniteDuration] = None
-  ): Resource[IO, (Port, KillSwitch)] =
-    Resource.eval(server(routes, gracefulShutdownTimeout).allocated)
+  ): Resource[IO, (Port, KillSwitch)] = for {
+    stopSignal <- Resource.eval(Deferred[IO, Unit])
+    portValue <- Resource.eval(Deferred[IO, Port])
+    _ <- server(routes, gracefulShutdownTimeout).use(port => portValue.complete(port) *> stopSignal.get).background
+    port <- Resource.eval(portValue.get)
+  } yield (port, stopSignal.complete(()).void)
 
   def server(routes: NonEmptyList[ROUTE], gracefulShutdownTimeout: Option[FiniteDuration] = None): Resource[IO, Port]
 }