diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-06-30 09:57:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-30 09:57:12 +0200 |
commit | 2c112787b1fc14245bcd8a32919d3c2d3d573ea6 (patch) | |
tree | 7bbfccc7b5cd42d4837afd1a7a1080dcaccecdf4 /container-core/src | |
parent | e4900248df1a6c5d240c633704f71e098b41ef40 (diff) | |
parent | bc4c3013f9097a35047d91ff67d072d1dbe565e0 (diff) |
Merge pull request #13746 from vespa-engine/jonmv/log-log-reader-exceptions
Log any error when reading logs on logserver
Diffstat (limited to 'container-core/src')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/LogHandler.java | 8 |
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); + } } }; } |