diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-05-24 21:06:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 21:06:07 +0200 |
| commit | 076aa66db97f0eec04596f16e210643ff7ae3772 (patch) | |
| tree | f0998f9e17c41cad6f92afd596215096b8476334 /configserver | |
| parent | e3acfa13c706e0a03c6e4c90d441ea8b2bb4fd7b (diff) | |
| parent | d14649366a7d48fc88ec28e27deb6e1aae9b96ff (diff) | |
Merge pull request #22740 from vespa-engine/jonmv/logserver-container-for-tester
Jonmv/logserver container for tester
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 11 |
1 files changed, 8 insertions, 3 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 b13d4542eba..fd4f1824885 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 @@ -1135,9 +1135,14 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye .anyMatch(serviceInfo -> serviceInfo.getServiceType().equalsIgnoreCase("logserver"))) .findFirst().orElseThrow(() -> new IllegalArgumentException("Could not find host info for logserver")); - ServiceInfo serviceInfo = logServerHostInfo.getServices().stream().filter(service -> List.of(LOGSERVER_CONTAINER.serviceName, CONTAINER.serviceName).contains(service.getServiceType())) - .findFirst().orElseThrow(() -> new IllegalArgumentException("No container running on logserver host")); - int port = servicePort(serviceInfo); + ServiceInfo logService = logServerHostInfo.getServices().stream() + .filter(service -> LOGSERVER_CONTAINER.serviceName.equals(service.getServiceType())) + .findFirst() + .or(() -> logServerHostInfo.getServices().stream() + .filter(service -> CONTAINER.serviceName.equals(service.getServiceType())) + .findFirst()) + .orElseThrow(() -> new IllegalArgumentException("No container running on logserver host")); + int port = servicePort(logService); return "http://" + logServerHostInfo.getHostname() + ":" + port + "/logs"; } |