summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-05-08 08:05:15 +0200
committerGitHub <noreply@github.com>2019-05-08 08:05:15 +0200
commit18db088983ead31c0e71a59d8e995fbb20d73f91 (patch)
treeaa668b374d7789cf94d262ab36ccae50d9dce3ad /controller-api
parentd6cc9b88fd72318b890a2d39d61c9334e4357c4d (diff)
parentea6e9a69ec3a4363125cab5881ddf2740ee5a7a9 (diff)
Merge pull request #9309 from vespa-engine/olaa/remove-old-log-retrieval
Remove old log retrieval
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java4
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java17
2 files changed, 1 insertions, 20 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
index 91a9b5472f5..bcad82a23c1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
@@ -41,9 +41,7 @@ public interface ConfigServer {
Map<?,?> getServiceApiResponse(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath);
- Optional<Logs> getLogs(DeploymentId deployment, Map<String, String> queryParameters);
-
- InputStream getLogStream(DeploymentId deployment, Map<String, String> queryParameters);
+ InputStream getLogs(DeploymentId deployment, Map<String, String> queryParameters);
List<String> getContentClusters(DeploymentId deployment);
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java
deleted file mode 100644
index ec85fbea35e..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Logs.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.integration.configserver;
-
-import java.util.Map;
-
-public class Logs {
-
- private final Map<String, String> logs;
-
- public Logs(Map<String, String> logs) {
- this.logs = logs;
- }
-
- public Map<String, String> logs() {
- return this.logs;
- }
-}