summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-01-30 13:20:40 +0100
committerjonmv <venstad@gmail.com>2023-01-30 13:20:40 +0100
commit31dc86eb769055cddcb37789b6e7e84bad82b91d (patch)
tree2ab91102e23fd560df12fcf32d3b17efae2a934f /configserver
parent0282a2fd2806871859c08fdcad1cf31b12bb09ee (diff)
Use different status.html-client in public vs non-
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 5b46b08a6d0..9865cda7bc9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -182,7 +182,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
infraDeployerProvider.getInfraDeployer(),
configConvergenceChecker,
httpProxy,
- createEndpointsChecker(),
+ createEndpointsChecker(configserverConfig),
configserverConfig,
orchestrator,
new LogRetriever(),
@@ -1238,12 +1238,12 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
}
- private static EndpointsChecker createEndpointsChecker() {
- CloseableHttpClient client = VespaHttpClientBuilder.custom()
- .apacheBuilder()
- .setUserAgent("hosted-vespa-convergence-health-checker")
- .setDefaultHeaders(List.of(new BasicHeader(HttpHeaders.CONNECTION, "close")))
- .build();
+ private static EndpointsChecker createEndpointsChecker(ConfigserverConfig config) {
+ CloseableHttpClient client = (SystemName.from(config.system()).isPublic()
+ ? DefaultHttpClientBuilder.create(() -> null, "hosted-vespa-convergence-health-checker")
+ : VespaHttpClientBuilder.custom().apacheBuilder().setUserAgent("hosted-vespa-convergence-health-checker"))
+ .setDefaultHeaders(List.of(new BasicHeader(HttpHeaders.CONNECTION, "close")))
+ .build();
return EndpointsChecker.of(endpoint -> {
int remainingFailures = 3;
int remainingSuccesses = 100;