Merge pull request #33 from Dwolla/thrift-configuration

Add a configuration object for thrift builder

Author: tylernap

twitter-finagle/src/main/scala-ce2/com/dwolla/util/async/finagle/ThriftClient.scala

@@ -9,20 +9,30 @@ import com.dwolla.util.async.twitter._
 import com.twitter.finagle.Thrift
 import com.twitter.util.Closable
 
-import scala.reflect.ClassTag
 import scala.language.reflectiveCalls
+import scala.reflect.ClassTag
 
 object ThriftClient {
   def apply[Alg[_[_]] <: AnyRef {def asClosable: Closable}] = new PartiallyAppliedThriftClient[Alg]()
 
   class PartiallyAppliedThriftClient[Alg[_[_]] <: AnyRef {def asClosable: Closable} ] private[ThriftClient] (val dummy: Unit = ()) extends AnyVal {
-    def apply[G[_] : Async : ContextShift, F[_]](dest: String)
+    def apply[G[_] : Async : ContextShift, F[_]](dest: String, config: ThriftClientConfiguration = ThriftClientConfiguration())
                                                 (implicit
                                                  AFK: F ~~> G,
                                                  AlgR: Alg[ReaderT[F, Alg[F], *]],
                                                  CT: ClassTag[Alg[F]],
                                                  FK: FunctorK[Alg]): Resource[G, Alg[G]] = {
-      val acquire = Sync[G].delay(Thrift.client.build[Alg[F]](dest)).map(_.asyncMapK[G])
+      val acquire =
+        Sync[G].delay(
+          Thrift
+            .client
+            .withSessionPool.maxSize(config.sessionPoolMax)
+            .withRequestTimeout(config.requestTimeout)
+            .withTransport.connectTimeout(config.transportConnectTimeout)
+            .withSession.acquisitionTimeout(config.sessionAcquisitionTimeout)
+            .withRetryBudget(config.retryBudget)
+            .build[Alg[F]](dest)
+        ).map(_.asyncMapK[G])
       val release: Alg[G] => G[Unit] = alg => liftFuture(Sync[G].delay(alg.asClosable.close()))
 
       Resource.make(acquire)(release)

twitter-finagle/src/main/scala-ce3/com/dwolla/util/async/finagle/ThriftClient.scala

@@ -16,13 +16,23 @@ object ThriftClient {
   def apply[Alg[_[_]] <: AnyRef {def asClosable: Closable}] = new PartiallyAppliedThriftClient[Alg]()
 
   class PartiallyAppliedThriftClient[Alg[_[_]] <: AnyRef {def asClosable: Closable} ] private[ThriftClient] (val dummy: Unit = ()) extends AnyVal {
-    def apply[G[_] : Async, F[_]](dest: String)
+    def apply[G[_] : Async, F[_]](dest: String, config: ThriftClientConfiguration = ThriftClientConfiguration())
                                  (implicit
                                   AFK: F ~~> G,
                                   AlgR: Alg[ReaderT[F, Alg[F], *]],
                                   CT: ClassTag[Alg[F]],
                                   FK: FunctorK[Alg]): Resource[G, Alg[G]] = {
-      val acquire = Sync[G].delay(Thrift.client.build[Alg[F]](dest)).map(_.asyncMapK[G])
+      val acquire =
+        Sync[G].delay(
+          Thrift
+            .client
+            .withSessionPool.maxSize(config.sessionPoolMax)
+            .withRequestTimeout(config.requestTimeout)
+            .withSession.acquisitionTimeout(config.sessionAcquisitionTimeout)
+            .withTransport.connectTimeout(config.transportConnectTimeout)
+            .withRetryBudget(config.retryBudget)
+            .build[Alg[F]](dest)
+        ).map(_.asyncMapK[G])
       val release: Alg[G] => G[Unit] = alg => liftFuture(Sync[G].delay(alg.asClosable.close()))
 
       Resource.make(acquire)(release)

twitter-finagle/src/main/scala/com/dwolla/util/async/finagle/ThriftClientConfiguration.scala

@@ -0,0 +1,12 @@
+package com.dwolla.util.async.finagle
+
+import com.twitter.finagle.service.RetryBudget
+import com.twitter.util.Duration
+
+case class ThriftClientConfiguration(
+                                      requestTimeout: Duration = Duration.fromMinutes(4),
+                                      sessionAcquisitionTimeout: Duration = Duration.fromSeconds(30),
+                                      transportConnectTimeout: Duration = Duration.fromSeconds(30),
+                                      sessionPoolMax: Int = 50,
+                                      retryBudget: RetryBudget = RetryBudget.Empty
+                                    )