From 37951b2c6f99b0248c864f668c390e30a13d021c Mon Sep 17 00:00:00 2001 From: Pierre Ricadat Date: Mon, 16 Mar 2020 17:21:39 +0900 Subject: [PATCH] Fix WebSocket implementation --- akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala | 2 +- http4s/src/main/scala/caliban/Http4sAdapter.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala b/akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala index d637af4daa..c712f5a396 100644 --- a/akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala +++ b/akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala @@ -121,7 +121,7 @@ object AkkaHttpAdapter extends FailFastCirceSupport { case ObjectValue((fieldName, StreamValue(stream)) :: Nil) => stream.foreach { item => sendMessage(queue, id, ObjectValue(List(fieldName -> item)), result.errors) - }.fork.flatMap(fiber => subscriptions.update(_.updated(id, fiber))) + }.forkDaemon.flatMap(fiber => subscriptions.update(_.updated(id, fiber))) case other => sendMessage(queue, id, other, result.errors) *> IO.fromFuture(_ => queue.offer(TextMessage(s"""{"type":"complete","id":"$id"}""")) diff --git a/http4s/src/main/scala/caliban/Http4sAdapter.scala b/http4s/src/main/scala/caliban/Http4sAdapter.scala index dc11cf17f3..d5c8fa517d 100644 --- a/http4s/src/main/scala/caliban/Http4sAdapter.scala +++ b/http4s/src/main/scala/caliban/Http4sAdapter.scala @@ -147,7 +147,7 @@ object Http4sAdapter { case ObjectValue((fieldName, StreamValue(stream)) :: Nil) => stream.foreach { item => sendMessage(sendQueue, id, ObjectValue(List(fieldName -> item)), result.errors) - }.fork.flatMap(fiber => subscriptions.update(_.updated(id, fiber))) + }.forkDaemon.flatMap(fiber => subscriptions.update(_.updated(id, fiber))) case other => sendMessage(sendQueue, id, other, result.errors) *> sendQueue.enqueue1( WebSocketFrame.Text(s"""{"type":"complete","id":"$id"}""")