avoid contention of parser's monitor

http4s · Apr 18, 2021 · 854938a · 854938a
1 parent e180c8a
commit 854938a
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/blaze-server/src/main/scala/org/http4s/server/blaze/Http1ServerStage.scala b/blaze-server/src/main/scala/org/http4s/server/blaze/Http1ServerStage.scala
@@ -201,14 +201,16 @@ private[blaze] class Http1ServerStage[F[_]](
               .recoverWith(serviceErrorHandler(req))
               .flatMap(resp => F.delay(renderResponse(req, resp, cleanup)))
 
+            val theCancelToken = Some(
+              F.runCancelable(action) {
+                case Right(()) => IO.unit
+                case Left(t) =>
+                  IO(logger.error(t)(s"Error running request: $req")).attempt *> IO(
+                    closeConnection())
+              }.unsafeRunSync())
+
             parser.synchronized {
-              cancelToken = Some(
-                F.runCancelable(action) {
-                  case Right(()) => IO.unit
-                  case Left(t) =>
-                    IO(logger.error(t)(s"Error running request: $req")).attempt *> IO(
-                      closeConnection())
-                }.unsafeRunSync())
+              cancelToken = theCancelToken
             }
           }
         })