Add client cache sub project #337
Conversation
build.sbt
Outdated
| .in(file("modules/client-cache")) | ||
| .settings(moduleName := "frees-rpc-client-cache") | ||
| .settings(clientCacheSettings) | ||
| .settings(addCompilerPlugin(%%("paradise") cross CrossVersion.full)) |
There was a problem hiding this comment.
Without this line I get a Missing required plugin: macroparadise compiler error.
There was a problem hiding this comment.
It's weird, it should be provided by the project plugin: https://github.com/frees-io/freestyle-rpc/blob/14671779136aa05ea146ae3126ef410cbd4f52db/project/ProjectPlugin.scala#L209
There was a problem hiding this comment.
I was overriding the libraryDependencies before, but it looks like we only get the paradise plugin and a scalatest test dependency from the project plugin.
I switched back to ++=, so should be fine now.
project/ProjectPlugin.scala
Outdated
| lazy val clientCacheSettings: Seq[Def.Setting[_]] = Seq( | ||
| libraryDependencies := Seq( | ||
| %%("log4s", V.log4s), | ||
| %%("fs2-core", "0.10.1"), |
There was a problem hiding this comment.
This it the fs2 version used by the fs2-reactive-streams version that we are currently using.
This one is sadly still on cats-effect 0.8.0
There was a problem hiding this comment.
Updated to 0.10.5, also added an explicit dependency to fs2 0.10.5 to internal so that the transitive fs2 0.10.1 gets evicted.
There was a problem hiding this comment.
Cool, thanks @peterneyens
| @@ -73,6 +73,13 @@ lazy val `client-okhttp` = project | |||
| .settings(clientOkHttpSettings) | |||
| .disablePlugins(ScriptedPlugin) | |||
|
|
|||
| lazy val `client-cache` = project | |||
There was a problem hiding this comment.
Let's add it to the "modules registry" below in this file
project/ProjectPlugin.scala
Outdated
| lazy val clientCacheSettings: Seq[Def.Setting[_]] = Seq( | ||
| libraryDependencies := Seq( | ||
| %%("log4s", V.log4s), | ||
| %%("fs2-core", "0.10.1"), |
There was a problem hiding this comment.
I'd add the 0.10.1 fs2 val with the rest, same for the better-monadic-for
| (map, _) <- ref.get | ||
| client <- map | ||
| .get(hostAndPort) | ||
| .fold { |
There was a problem hiding this comment.
Generally, I prefer using fold. However, once once each case starts spawning over three-four lines, I find it more readable to use a match:
client <- map.get(hostAndPort) match {
case None =>
/** 6 lines of code*/
case Some(clientMeta) =>
/** 5 lines of code*/
} I find indentation an easier separator than several-line-separated parentheses.
| ref | ||
| .modify(_.leftMap(_.updated(hostAndPort, clientMeta.copy(lastAccessed = now)))) | ||
| .as(clientMeta.client)) | ||
| (_, lastClean) <- ref.get |
There was a problem hiding this comment.
Can we extract lines 82-85 as a separate def cleanIfStale(atTime: Instant): F[Unit] method?
peterneyens
changed the title
Add a cache for RPC clients.