summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-09-20 12:22:55 +0200
committerGitHub <noreply@github.com>2018-09-20 12:22:55 +0200
commit122903006dd0f1074c0472094440acad32c68a27 (patch)
tree7c0cb9c8666b4a83b085a61af08f7539de3f12ff /container-core
parentd06c943b265e1e635f6b2a61358778db29f787c3 (diff)
parent8b49678b186918a5e36fa78026568f8a4615ccee (diff)
Merge pull request #7026 from vespa-engine/olaaun/filter-on-log-creation
Filter on file creation time instead of last modified time
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/handler/LogReader.java5
1 files changed, 2 insertions, 3 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 2483f2497d0..5d78e37ec9e 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
@@ -7,6 +7,7 @@ import javax.xml.bind.DatatypeConverter;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.attribute.BasicFileAttributes;
public class LogReader {
@@ -28,9 +29,7 @@ public class LogReader {
private void traverse_folder(File root, JSONObject json, String filename) throws IOException, JSONException {
File[] files = root.listFiles();
for(File child : files) {
- File temp = child;
- JSONObject childJson = new JSONObject();
- long logTime = child.lastModified();
+ long logTime = Files.readAttributes(child.toPath(), BasicFileAttributes.class).creationTime().toMillis();
if(child.isFile() && earliestLogThreshold < logTime && logTime < latestLogThreshold) {
json.put(filename + child.getName(), DatatypeConverter.printBase64Binary(Files.readAllBytes(child.toPath())));
}