summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2019-11-20 14:40:11 +0100
committerOla Aunrønning <olaa@verizonmedia.com>2019-11-20 14:40:11 +0100
commitc65abc64c7376629681a6e0cec3acf20254a3102 (patch)
tree8d62f1036b5b8758ebf8a6ae839171250a8cc0b8 /configserver
parent063dcfef8881dbb10775f7f2983a86ccc9b7b9da (diff)
Log instead of throwing UncheckedIOException
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java7
1 files changed, 5 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 1116648ae7b..0f5642525d3 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
@@ -3,14 +3,15 @@ package com.yahoo.vespa.config.server.http;
import ai.vespa.util.http.VespaHttpClientBuilder;
import com.yahoo.container.jdisc.HttpResponse;
+import com.yahoo.yolean.Exceptions;
import org.apache.http.Header;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.UncheckedIOException;
import java.util.Optional;
+import java.util.logging.Logger;
/**
* @author olaaun
@@ -18,13 +19,15 @@ import java.util.Optional;
public class LogRetriever {
private final HttpClient httpClient = VespaHttpClientBuilder.create().build();
+ private static final Logger logger = Logger.getLogger(LogRetriever.class.getName());
public HttpResponse getLogs(String logServerHostname) {
HttpGet get = new HttpGet(logServerHostname);
try {
return new ProxyResponse(httpClient.execute(get));
} catch (IOException e) {
- throw new UncheckedIOException(e);
+ logger.warning("Failed to get logs: " + Exceptions.toMessageString(e));
+ return HttpErrorResponse.internalServerError(Exceptions.toMessageString(e));
}
}