diff options
author | Harald Musum <musum@oath.com> | 2018-09-17 15:39:37 +0200 |
---|---|---|
committer | olaaun <ola.aunroe@gmail.com> | 2018-09-17 15:39:37 +0200 |
commit | 63238ef81aa79e32f6ba691d99e2f973066b4dd1 (patch) | |
tree | 3fc00cf6194d425d298283fd28d6a146d83bbb8c /configserver | |
parent | 87a22cc39efc56bc120111f41492b2f86df5409f (diff) |
Set content type for logs response (#6978)
* Set content type for logs response
* Use a class for responses
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java index dd60d158313..9e8bcdccf79 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java @@ -21,7 +21,7 @@ public class LogRetriever { try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) { org.apache.http.HttpResponse response = httpClient.execute(get); String responseBody = EntityUtils.toString(response.getEntity(), "UTF-8"); - return new HttpResponse(response.getStatusLine().getStatusCode()) { + return new LogsResponse(response.getStatusLine().getStatusCode()) { @Override public void render(OutputStream outputStream) throws IOException { if (response.getEntity() != null ) outputStream.write(responseBody.getBytes()); @@ -29,13 +29,26 @@ public class LogRetriever { }; } catch (IOException e) { log.log(Level.WARNING, "Failed to retrieve logs from log server", e); - return new HttpResponse(404) { + return new LogsResponse(404) { @Override public void render(OutputStream outputStream) throws IOException { outputStream.write(e.toString().getBytes()); } + }; } } + + private abstract static class LogsResponse extends HttpResponse { + + LogsResponse(int status) { + super(status); + } + + @Override + public String getContentType() { + return "application/json"; + } + } } |