diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-08 13:48:26 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-04-08 13:48:26 +0200 |
commit | fcd8107138a2b3554df05ef9318441ad4f80a7c0 (patch) | |
tree | a44f0e1c465b56ce28bd5de966432ced53ffd79c | |
parent | f07ea2d3f979a635e0039923bae13f9b2910f102 (diff) |
Use VespaHttpClientBuilder in service-monitor
-rw-r--r-- | service-monitor/pom.xml | 6 | ||||
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 338f0331f9d..578fcc83006 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -24,6 +24,12 @@ <!-- This is necessary to get 4.4's HostnameVerifier API of SSLConnectionSocketFactory::new --> <scope>compile</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>http-utils</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> <!-- provided scope --> <dependency> diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java index 4a382ee8d94..cdb7c03c999 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/ApacheHttpClient.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.service.health; +import ai.vespa.util.http.VespaHttpClientBuilder; import org.apache.http.HttpResponse; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -12,7 +13,6 @@ import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy; -import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.BasicHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; @@ -57,7 +57,7 @@ class ApacheHttpClient implements AutoCloseable { } }; - return HttpClients.custom() + return VespaHttpClientBuilder.createWithBasicConnectionManager() .setKeepAliveStrategy(keepAliveStrategy) .setConnectionManager(connectionManager) .disableAutomaticRetries() |