-
Notifications
You must be signed in to change notification settings - Fork 788
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4179 from RaasAhsan/ember-server-graceful-shutdown
Ember server graceful shutdown
- Loading branch information
Showing
5 changed files
with
211 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
ember-server/src/main/scala/org/http4s/ember/server/internal/Shutdown.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Copyright 2019 http4s.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.http4s.ember.server.internal | ||
|
|
||
| import cats.syntax.all._ | ||
| import cats.effect._ | ||
| import cats.effect.implicits._ | ||
| import cats.effect.concurrent._ | ||
| import fs2.Stream | ||
|
|
||
| import scala.concurrent.duration.{Duration, FiniteDuration} | ||
|
|
||
| private[server] abstract class Shutdown[F[_]] { | ||
| def await: F[Unit] | ||
| def signal: F[Unit] | ||
| def newConnection: F[Unit] | ||
| def removeConnection: F[Unit] | ||
|
|
||
| def trackConnection: Stream[F, Unit] = | ||
| Stream.bracket(newConnection)(_ => removeConnection) | ||
| } | ||
|
|
||
| private[server] object Shutdown { | ||
|
|
||
| def apply[F[_]](timeout: Duration)(implicit F: Concurrent[F], timer: Timer[F]): F[Shutdown[F]] = | ||
| timeout match { | ||
| case fi: FiniteDuration => | ||
| if (fi.length == 0) immediateShutdown else timedShutdown(timeout) | ||
| case _ => timedShutdown(timeout) | ||
| } | ||
|
|
||
| private def timedShutdown[F[_]]( | ||
| timeout: Duration)(implicit F: Concurrent[F], timer: Timer[F]): F[Shutdown[F]] = { | ||
| case class State(isShutdown: Boolean, active: Int) | ||
|
|
||
| for { | ||
| unblockStart <- Deferred[F, Unit] | ||
| unblockFinish <- Deferred[F, Unit] | ||
| state <- Ref.of[F, State](State(false, 0)) | ||
| } yield new Shutdown[F] { | ||
| override val await: F[Unit] = | ||
| unblockStart | ||
| .complete(()) | ||
| .flatMap { _ => | ||
| state.modify { case s @ State(_, active) => | ||
| val fa = if (active == 0) { | ||
| F.unit | ||
| } else { | ||
| timeout match { | ||
| case fi: FiniteDuration => unblockFinish.get.timeoutTo(fi, F.unit) | ||
| case _ => unblockFinish.get | ||
| } | ||
| } | ||
| s.copy(isShutdown = true) -> fa | ||
| } | ||
| } | ||
| .uncancelable | ||
| .flatten | ||
|
|
||
| override val signal: F[Unit] = | ||
| unblockStart.get | ||
|
|
||
| override val newConnection: F[Unit] = | ||
| state.update { s => | ||
| s.copy(active = s.active + 1) | ||
| } | ||
|
|
||
| override val removeConnection: F[Unit] = | ||
| state | ||
| .modify { case s @ State(isShutdown, active) => | ||
| val conns = active - 1 | ||
| if (isShutdown && conns <= 0) { | ||
| s.copy(active = conns) -> unblockFinish.complete(()) | ||
| } else { | ||
| s.copy(active = conns) -> F.unit | ||
| } | ||
| } | ||
| .flatten | ||
| .uncancelable | ||
| } | ||
| } | ||
|
|
||
| private def immediateShutdown[F[_]](implicit F: Concurrent[F]): F[Shutdown[F]] = | ||
| Deferred[F, Unit].map { unblock => | ||
| new Shutdown[F] { | ||
| override val await: F[Unit] = unblock.complete(()) | ||
| override val signal: F[Unit] = unblock.get | ||
| override val newConnection: F[Unit] = F.unit | ||
| override val removeConnection: F[Unit] = F.unit | ||
| override val trackConnection: Stream[F, Unit] = Stream.empty | ||
| } | ||
| } | ||
|
|
||
| } |
64 changes: 64 additions & 0 deletions
64
ember-server/src/test/scala/org/http4s/ember/server/EmberServerSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright 2019 http4s.org | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.http4s.ember.server | ||
|
|
||
| import cats.syntax.all._ | ||
| import cats.effect._ | ||
| import org.http4s._ | ||
| import org.http4s.client.Client | ||
| import org.http4s.server.Server | ||
| import org.http4s.implicits._ | ||
| import org.http4s.dsl.Http4sDsl | ||
| import org.http4s.ember.client.EmberClientBuilder | ||
|
|
||
| import scala.concurrent.duration._ | ||
|
|
||
| class EmberServerSuite extends Http4sSuite { | ||
|
|
||
| def service[F[_]](implicit F: Async[F]): HttpApp[F] = { | ||
| val dsl = new Http4sDsl[F] {} | ||
| import dsl._ | ||
|
|
||
| HttpRoutes | ||
| .of[F] { case GET -> Root => | ||
| Ok("Hello!") | ||
| } | ||
| .orNotFound | ||
| } | ||
|
|
||
| def serverResource: Resource[IO, Server[IO]] = | ||
| EmberServerBuilder | ||
| .default[IO] | ||
| .withHttpApp(service[IO]) | ||
| .build | ||
|
|
||
| def client: FunFixture[Client[IO]] = | ||
| ResourceFixture(EmberClientBuilder.default[IO].build) | ||
|
|
||
| def server: FunFixture[Server[IO]] = | ||
| ResourceFixture(serverResource) | ||
|
|
||
| def fixture: FunFixture[(Server[IO], Client[IO])] = | ||
| FunFixture.map2(server, client) | ||
|
|
||
| fixture.test("server responds to requests") { case (server, client) => | ||
| IO.sleep(3.seconds) >> client | ||
| .get(s"http://${server.address.getHostName}:${server.address.getPort}")(_.status.pure[IO]) | ||
| .timeout(5.seconds) | ||
| .assertEquals(Status.Ok) | ||
| } | ||
| } |