Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PoolManager] - Synchronized -> Semaphore, wrap side-effects in Effect[F].delay #1934

Merged
merged 22 commits into from Aug 17, 2018
Merged

[PoolManager] - Synchronized -> Semaphore, wrap side-effects in Effect[F].delay #1934

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4b1c31f
Using a Semaphore instead of synchronizing
Jun 15, 2018
4c58fc2
Attempt at purifying functions
Jun 15, 2018
d5584a0
More purifying of pool manager
Jun 15, 2018
a04e026
Purifying the code
Jun 16, 2018
2f17e3c
Creation of a PoolManager is an effect at this point
Jul 3, 2018
05b3b7c
Merge branch 'master' into attempt-at-purifying-pool-mgr
Jul 3, 2018
ba0e8fa
Make sure to acquire permit for disposeConnection
Jul 4, 2018
a35ec4e
Make sure to properly releaseNonRecyclable
Jul 4, 2018
ed77b3a
Forgo to format
Jul 4, 2018
24bc93a
Format blaze-client module as well
Jul 4, 2018
6dc5c7c
Removing commented imports
Jul 4, 2018
c6ee932
Removing the PooledHttp1Client
Jul 5, 2018
2558d10
Switching PoolManager and upstream things to Concurrent instead of Ef…
Jul 5, 2018
fc3841a
Just have Http1Client be constrained by ConcurrentEffect
Jul 5, 2018
d880407
Start effect after we incrConnection
Jul 5, 2018
3773e37
Getting things to compile with global ec
Jul 7, 2018
e40f9c3
Update MimeGenerator.scala
tbrown1979 Jul 7, 2018
136df85
Use IOApp for client examples
Jul 7, 2018
ae0aa92
Merge branch 'attempt-at-purifying-pool-mgr' of https://github.com/tb…
Jul 7, 2018
14a39ad
MimeLoaderApp is now an IOApp
Aug 8, 2018
0ec71df
Using .withPermit instead of explicit acquire/release
Aug 14, 2018
f88439e
Hit callback in the else
Aug 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions blaze-client/src/main/scala/org/http4s/client/blaze/Http1Client.scala
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ package client
package blaze

import cats.effect._
import cats.implicits._
import fs2.Stream

/** Create a HTTP1 client which will attempt to recycle connections */
Expand All @@ -14,24 +15,24 @@ object Http1Client {
*/
def apply[F[_]](config: BlazeClientConfig = BlazeClientConfig.defaultConfig)(
implicit F: Effect[F]): F[Client[F]] =
F.delay(mkClient(config))
mkClient(config)

def stream[F[_]: Effect](
config: BlazeClientConfig = BlazeClientConfig.defaultConfig): Stream[F, Client[F]] =
Stream.bracket(apply(config))(_.shutdown)

private[blaze] def mkClient[F[_]: Effect](config: BlazeClientConfig): Client[F] = {
private[blaze] def mkClient[F[_]: Effect](config: BlazeClientConfig): F[Client[F]] = {
val http1: ConnectionBuilder[F, BlazeConnection[F]] = Http1Support(config)
val pool = ConnectionManager.pool(

ConnectionManager.pool(
builder = http1,
maxTotal = config.maxTotalConnections,
maxWaitQueueLimit = config.maxWaitQueueLimit,
maxConnectionsPerRequestKey = config.maxConnectionsPerRequestKey,
responseHeaderTimeout = config.responseHeaderTimeout,
requestTimeout = config.requestTimeout,
executionContext = config.executionContext
)
BlazeClient(pool, config, pool.shutdown())
).map(pool => BlazeClient(pool, config, pool.shutdown()))
}

}
14 changes: 8 additions & 6 deletions blaze-client/src/main/scala/org/http4s/client/blaze/PooledHttp1Client.scala
View file
Open in desktop
Expand Up @@ -18,10 +18,12 @@ object PooledHttp1Client {
maxWaitQueueLimit: Int = bits.DefaultMaxWaitQueueLimit,
maxConnectionsPerRequestKey: RequestKey => Int = _ => bits.DefaultMaxTotalConnections,
config: BlazeClientConfig = BlazeClientConfig.defaultConfig): Client[F] =
Http1Client.mkClient(
config.copy(
maxTotalConnections = maxTotalConnections,
maxWaitQueueLimit = maxWaitQueueLimit,
maxConnectionsPerRequestKey = maxConnectionsPerRequestKey
))
Effect[F].toIO {
Http1Client.mkClient(
config.copy(
maxTotalConnections = maxTotalConnections,
maxWaitQueueLimit = maxWaitQueueLimit,
maxConnectionsPerRequestKey = maxConnectionsPerRequestKey
))
}.unsafeRunSync()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going to force toIO, might as well make the whole call return F[Client[F]] instead. There's no need to maintain source compat on a deprecated method since M7 of 0.18.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmcardon Is it okay to just remove the PooledHttp1Client then? I only did this so that we could keep it around, but figured I'd get questions about it.

}
24 changes: 14 additions & 10 deletions client/src/main/scala/org/http4s/client/ConnectionManager.scala
View file
Open in desktop
Expand Up @@ -2,7 +2,8 @@ package org.http4s
package client

import cats.effect._

import cats.effect.concurrent.Semaphore
import cats.implicits._
import scala.concurrent.ExecutionContext
import scala.concurrent.duration.Duration

Expand Down Expand Up @@ -63,13 +64,16 @@ object ConnectionManager {
maxConnectionsPerRequestKey: RequestKey => Int,
responseHeaderTimeout: Duration,
requestTimeout: Duration,
executionContext: ExecutionContext): ConnectionManager[F, A] =
new PoolManager[F, A](
builder,
maxTotal,
maxWaitQueueLimit,
maxConnectionsPerRequestKey,
responseHeaderTimeout,
requestTimeout,
executionContext)
executionContext: ExecutionContext): F[ConnectionManager[F, A]] =
Semaphore.uncancelable(1).map { semaphore =>
new PoolManager[F, A](
builder,
maxTotal,
maxWaitQueueLimit,
maxConnectionsPerRequestKey,
responseHeaderTimeout,
requestTimeout,
semaphore,
executionContext)
}
}