summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-06-30 09:56:27 +0200
committerJon Marius Venstad <venstad@gmail.com>2020-06-30 09:56:27 +0200
commitbc4c3013f9097a35047d91ff67d072d1dbe565e0 (patch)
tree60376f91ca461b1a7ada60f3973260ad8eabd5be /container-core
parent0dbbd3c3be2870681480e73f9cc491e349b06610 (diff)
Log any error when reading logs on logserver
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/LogHandler.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
index 1d6e1a0893d..f3149ed4998 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
@@ -11,6 +11,7 @@ import java.io.OutputStream;
import java.time.Instant;
import java.util.Optional;
import java.util.concurrent.Executor;
+import java.util.logging.Level;
public class LogHandler extends ThreadedHttpRequestHandler {
@@ -37,7 +38,12 @@ public class LogHandler extends ThreadedHttpRequestHandler {
return new HttpResponse(200) {
@Override
public void render(OutputStream outputStream) {
- logReader.writeLogs(outputStream, from, to);
+ try {
+ logReader.writeLogs(outputStream, from, to);
+ }
+ catch (Throwable t) {
+ log.log(Level.WARNING, "Failed reading logs from " + from + " to " + to, t);
+ }
}
};
}