diff options
| author | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-10-11 08:32:44 +0200 |
|---|---|---|
| committer | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-10-11 08:32:44 +0200 |
| commit | 713dc49307868c690c9be0ea1ee0529b4e3ae79e (patch) | |
| tree | dcd8386fa552b274cc6d1f44b0f1112d01a9d15b /docker-api | |
| parent | 491bd2538d14ead95d61849b9e3059a278f74a13 (diff) | |
More cleanups.
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 73723874c99..a2bda737e9e 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -78,6 +78,12 @@ public class DockerImpl implements Docker { private CounterWrapper numberOfDockerDaemonFails; private final boolean hackAroundPullImageDueToJerseyConflicts; + private final JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory() + .withMaxPerRouteConnections(DOCKER_MAX_PER_ROUTE_CONNECTIONS) + .withMaxTotalConnections(DOCKER_MAX_TOTAL_CONNECTIONS) + .withConnectTimeout(DOCKER_CONNECT_TIMEOUT_MILLIS) + .withReadTimeout(DOCKER_READ_TIMEOUT_MILLIS); + // For testing DockerImpl(final DockerClient dockerClient) { hackAroundPullImageDueToJerseyConflicts = false; @@ -87,11 +93,6 @@ public class DockerImpl implements Docker { // For testing public DockerImpl(final DockerConfig config) { hackAroundPullImageDueToJerseyConflicts = false; - JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory() - .withMaxPerRouteConnections(DOCKER_MAX_PER_ROUTE_CONNECTIONS) - .withMaxTotalConnections(DOCKER_MAX_TOTAL_CONNECTIONS) - .withConnectTimeout(DOCKER_CONNECT_TIMEOUT_MILLIS) - .withReadTimeout(DOCKER_READ_TIMEOUT_MILLIS); // Fail fast RemoteApiVersion remoteApiVersion = getRemoteApiVersion(config, 100 /* connect timeout millis */); this.dockerClient = DockerClientImpl.getInstance( @@ -104,11 +105,6 @@ public class DockerImpl implements Docker { @Inject public DockerImpl(final DockerConfig config, MetricReceiverWrapper metricReceiver) { - JerseyDockerCmdExecFactory dockerFactory = new JerseyDockerCmdExecFactory() - .withMaxPerRouteConnections(DOCKER_MAX_PER_ROUTE_CONNECTIONS) - .withMaxTotalConnections(DOCKER_MAX_TOTAL_CONNECTIONS) - .withConnectTimeout(DOCKER_CONNECT_TIMEOUT_MILLIS) - .withReadTimeout(DOCKER_READ_TIMEOUT_MILLIS); hackAroundPullImageDueToJerseyConflicts = true; RemoteApiVersion remoteApiVersion; try { |