diff options
| author | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-13 16:04:22 +0200 |
|---|---|---|
| committer | Ola Aunrønning <ola.aunroe@gmail.com> | 2018-09-18 10:27:33 +0200 |
| commit | 96427331aa1d61eed9a2a0ef5999100b43e30282 (patch) | |
| tree | a59faf4ffa44d8d09e70ef0e80cb80dcbd79508a /configserver | |
| parent | eb05c7a5b60ccf448b59038d7416c67f6aa68958 (diff) | |
filter number of logs
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 4 | ||||
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java | 3 |
2 files changed, 4 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 6a55fb77933..6ed496a56fb 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 @@ -483,8 +483,8 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye // ---------------- Logs ---------------------------------------------------------------- - public HttpResponse getLogs(ApplicationId applicationId) { - String logServerHostName = getLogServerURI(applicationId); + public HttpResponse getLogs(ApplicationId applicationId, String apiParams) { + String logServerHostName = getLogServerURI(applicationId) + "/" + apiParams; LogRetriever logRetriever = new LogRetriever(); return logRetriever.getLogs(logServerHostName); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java index b65cb370f93..2702bbdbc6e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java @@ -97,7 +97,8 @@ public class ApplicationHandler extends HttpHandler { } if (isLogRequest(request)) { - return applicationRepository.getLogs(applicationId); + String apiParams = request.hasProperty("numberOf") ? request.getProperty("numberOfLogs") : ""; + return applicationRepository.getLogs(applicationId, apiParams); } return new GetApplicationResponse(Response.Status.OK, applicationRepository.getApplicationGeneration(applicationId)); |