Handle errors in finalizers

softwaremill · Jan 24, 2025 · 0eb74d1 · 0eb74d1
1 parent 47dda50
commit 0eb74d1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/core/src/main/scalajvm/sttp/client4/httpclient/HttpClientFutureBackend.scala b/core/src/main/scalajvm/sttp/client4/httpclient/HttpClientFutureBackend.scala
@@ -81,7 +81,7 @@ class HttpClientFutureBackend private (
 
   override protected def ensureOnAbnormal[T](effect: Future[T])(finalizer: => Future[Unit]): Future[T] =
     effect.recoverWith { case e =>
-      finalizer.flatMap(_ => Future.failed(e))
+      finalizer.flatMap(_ => Future.failed(e)).recoverWith { case e2 => e.addSuppressed(e2); Future.failed(e) }
     }
 }
 

diff --git a/effects/cats/src/main/scalajvm/sttp/client4/httpclient/cats/HttpClientCatsBackend.scala b/effects/cats/src/main/scalajvm/sttp/client4/httpclient/cats/HttpClientCatsBackend.scala
@@ -83,7 +83,7 @@ class HttpClientCatsBackend[F[_]: Async] private (
 
   override protected def ensureOnAbnormal[T](effect: F[T])(finalizer: => F[Unit]): F[T] =
     Async[F].guaranteeCase(effect) { outcome =>
-      if (outcome.isSuccess) Async[F].unit else finalizer
+      if (outcome.isSuccess) Async[F].unit else Async[F].onError(finalizer)(t => Async[F].delay(t.printStackTrace()))
     }
 
   override protected def emptyBody(): InputStream = emptyInputStream()

diff --git a/effects/fs2-ce2/src/main/scalajvm/sttp/client4/httpclient/fs2/HttpClientFs2Backend.scala b/effects/fs2-ce2/src/main/scalajvm/sttp/client4/httpclient/fs2/HttpClientFs2Backend.scala
@@ -93,7 +93,8 @@ class HttpClientFs2Backend[F[_]: ConcurrentEffect: ContextShift] private (
 
   override protected def ensureOnAbnormal[T](effect: F[T])(finalizer: => F[Unit]): F[T] =
     ConcurrentEffect[F].guaranteeCase(effect) { exitCase =>
-      if (exitCase == ExitCase.Completed) ConcurrentEffect[F].unit else finalizer
+      if (exitCase == ExitCase.Completed) ConcurrentEffect[F].unit
+      else ConcurrentEffect[F].onError(finalizer)(t => ConcurrentEffect[F].delay(t.printStackTrace()))
     }
 
   override protected def emptyBody(): Stream[F, Byte] = Stream.empty

diff --git a/effects/fs2/src/main/scalajvm/sttp/client4/httpclient/fs2/HttpClientFs2Backend.scala b/effects/fs2/src/main/scalajvm/sttp/client4/httpclient/fs2/HttpClientFs2Backend.scala
@@ -97,7 +97,7 @@ class HttpClientFs2Backend[F[_]: Async] private (
 
   override protected def ensureOnAbnormal[T](effect: F[T])(finalizer: => F[Unit]): F[T] =
     Async[F].guaranteeCase(effect) { outcome =>
-      if (outcome.isSuccess) Async[F].unit else finalizer
+      if (outcome.isSuccess) Async[F].unit else Async[F].onError(finalizer)(t => Async[F].delay(t.printStackTrace()))
     }
 
   override protected def emptyBody(): Stream[F, Byte] = Stream.empty

diff --git a/effects/monix/src/main/scalajvm/sttp/client4/httpclient/monix/HttpClientMonixBackend.scala b/effects/monix/src/main/scalajvm/sttp/client4/httpclient/monix/HttpClientMonixBackend.scala
@@ -87,7 +87,9 @@ class HttpClientMonixBackend private (
   override protected def cancelLowLevelBody(p: Publisher[ju.List[ByteBuffer]]): Unit = cancelPublisher(p)
 
   override protected def ensureOnAbnormal[T](effect: Task[T])(finalizer: => Task[Unit]): Task[T] =
-    effect.guaranteeCase { exit => if (exit == ExitCase.Completed) Task.unit else finalizer }
+    effect.guaranteeCase { exit =>
+      if (exit == ExitCase.Completed) Task.unit else finalizer.onErrorHandleWith(t => Task.eval(t.printStackTrace()))
+    }
 
   override protected def emptyBody(): Observable[Array[Byte]] = Observable.empty
 

diff --git a/effects/zio1/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala b/effects/zio1/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala
@@ -75,7 +75,7 @@ class HttpClientZioBackend private (
 
   override protected def ensureOnAbnormal[T](effect: Task[T])(finalizer: => Task[Unit]): Task[T] = effect.onExit {
     exit =>
-      if (exit.succeeded) ZIO.unit else finalizer.orDie
+      if (exit.succeeded) ZIO.unit else finalizer.catchAll(t => ZIO.effect(t.printStackTrace()).orDie)
   }.resurrect
 
   override protected val bodyToHttpClient: BodyToHttpClient[Task, ZioStreams, R] =