diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-09-08 16:49:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 16:49:54 +0200 |
| commit | 7efc62693de90e2bc2c8cb5d716da6961af2abb1 (patch) | |
| tree | 889e56f04682cddc002da7e43291c431eba8cc0f | |
| parent | e5f5bd5239a2dd16e4e818640f532f300c2b5a25 (diff) | |
| parent | e05db997c2ce3c9894cc631f418b4429cd9e4d65 (diff) | |
Merge pull request #14328 from vespa-engine/jonmv/flush-log-stream-every-64k-lines
Skip files with mtime before oldest entry asked for
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/LogReader.java | 3 |
1 files changed, 2 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 a304dc3c4ff..ea2f431f5a6 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 @@ -188,7 +188,8 @@ class LogReader { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { - if (logFilePattern.matcher(file.getFileName().toString()).matches()) + if ( logFilePattern.matcher(file.getFileName().toString()).matches() + && ! attrs.lastModifiedTime().toInstant().isBefore(from)) paths.add(file); return FileVisitResult.CONTINUE; |