diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-02 14:23:54 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-02 14:23:54 +0200 |
commit | 26caf9c507decbee8da28a12913b6bb0397de548 (patch) | |
tree | a95ad00cdb5bde6279babb7885bd514e704d5b2e /container-core | |
parent | bd92ef3cdb7db5eb03b466913b335bc5cc7faf41 (diff) |
Assume file may have been zipped or deleted since listed
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/LogReader.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java index 3532dac09f5..2884eb486ca 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/LogReader.java +++ b/container-core/src/main/java/com/yahoo/container/handler/LogReader.java @@ -15,6 +15,7 @@ import java.io.OutputStreamWriter; import java.io.UncheckedIOException; import java.nio.file.FileVisitResult; import java.nio.file.Files; +import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; @@ -98,7 +99,18 @@ class LogReader { private LogLineIterator(Path log, double from, double to, Optional<String> hostname) throws IOException { boolean zipped = log.toString().endsWith(".gz"); - InputStream in = Files.newInputStream(log); + InputStream in = InputStream.nullInputStream(); + try { + in = Files.newInputStream(log); + } + catch (NoSuchFileException e) { + if ( ! zipped) + try { + in = Files.newInputStream(Paths.get(log.toString() + ".gz")); + zipped = true; + } + catch (NoSuchFileException ignored) { } + } this.reader = new BufferedReader(new InputStreamReader(zipped ? new GZIPInputStream(in) : in, UTF_8)); this.from = from; this.to = to; |