summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-11-10 14:23:18 +0100
committerGitHub <noreply@github.com>2020-11-10 14:23:18 +0100
commit615ae184cdf79ac893b1179aa2f9a8a56eede205 (patch)
treef1d7a35a785d67172a1cfeae75ef4aeefaea8973 /configserver
parentb33bbda48bdb561e60cdcd36c764b7b02cc6ae68 (diff)
parent8530605ca812a241bced85de66b9840dbe295bc3 (diff)
Merge pull request #15250 from vespa-engine/freva/cfg-logs
Use correct port for config server logs handler
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java3
1 files changed, 2 insertions, 1 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 bda78ce5a71..75262ec4c84 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
@@ -1023,7 +1023,8 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
// most applications under hosted-vespa are not known to the model and it's OK for a user to get
// logs for any host if they are authorized for the hosted-vespa tenant.
if (hostname.isPresent() && HOSTED_VESPA_TENANT.equals(applicationId.tenant())) {
- return "http://" + hostname.get() + ":8080/logs";
+ int port = List.of("zone-config-servers", "controller").contains(applicationId.application().value()) ? 4443 : 8080;
+ return "http://" + hostname.get() + ":" + port + "/logs";
}
Application application = getApplication(applicationId);