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.

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

JP - Evaluator client Apply with timeouts parameters #22

Merged
merged 2 commits into from
Aug 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ class EvaluatorClient(url: String,

object EvaluatorClient {

def apply(url: String, authKey: String) = new EvaluatorClient(url, authKey)
def apply(url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds) =
new EvaluatorClient(url, authKey, connTimeout, readTimeout)

implicit class EvaluationIOSyntaxXOR[A](
evalIO: EvalIO[EvaluationResponse[A]]) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ class Evaluator {
dependencies: List[Dependency] = Nil,
code: String): EvaluationResponse[EvalResponse] =
httpClient.post[EvalResponse](
url,
authKey,
url = url,
secretKey = authKey,
connTimeout = connTimeout,
readTimeout = readTimeout,
data = EvalRequest(resolvers, dependencies, code).asJson.noSpaces)

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import scala.concurrent.duration.Duration
sealed trait EvaluatorOp[A]
final case class Evaluates(url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
connTimeout: Duration,
readTimeout: Duration,
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String)
Expand All @@ -27,8 +27,8 @@ class EvaluatorOps[F[_]](implicit I: Inject[EvaluatorOp, F]) {
def evaluates(
url: String,
authKey: String,
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
connTimeout: Duration,
readTimeout: Duration,
resolvers: List[String] = Nil,
dependencies: List[Dependency] = Nil,
code: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class HttpClient {
url: String,
secretKey: String,
method: String = "post",
connTimeout: Duration = 1.second,
readTimeout: Duration = 10.seconds,
connTimeout: Duration,
readTimeout: Duration,
headers: Headers = Map.empty,
data: String
)(implicit D: Decoder[A]): EvaluationResponse[A] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ case class HttpRequestBuilder(
body
.fold(request)(
request
.postData(_)
.option(HttpOptions.connTimeout(connTimeout.toMillis.toInt))
.option(HttpOptions.readTimeout(readTimeout.toMillis.toInt))
.postData(_)
.header("content-type", "application/json"))
.asString
}
Expand Down