Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NIFI-1414'

This commit is contained in:
Mark Payne 2016-01-20 17:31:34 -05:00
parent ddd71b0a4e 1845f6df8d
commit 348831b20c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java
View File

@ -535,21 +535,22 @@ public class TailFile extends AbstractProcessor {
} }
final List<File> rolledOffFiles = new ArrayList<>(); final List<File> rolledOffFiles = new ArrayList<>();
final DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory.toPath(), rollingPattern); try (final DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory.toPath(), rollingPattern)) {
for (final Path path : dirStream) { for (final Path path : dirStream) {
final File file = path.toFile(); final File file = path.toFile();
final long lastMod = file.lastModified(); final long lastMod = file.lastModified();
if (file.lastModified() < minTimestamp) { if (file.lastModified() < minTimestamp) {
getLogger().debug("Found rolled off file {} but its last modified timestamp is before the cutoff (Last Mod = {}, Cutoff = {}) so will not consume it", getLogger().debug("Found rolled off file {} but its last modified timestamp is before the cutoff (Last Mod = {}, Cutoff = {}) so will not consume it",
new Object[] {file, lastMod, minTimestamp}); new Object[] {file, lastMod, minTimestamp});
continue; continue;
} else if (file.equals(tailFile)) { } else if (file.equals(tailFile)) {
continue; continue;
}
rolledOffFiles.add(file);
} }
rolledOffFiles.add(file);
} }
// Sort files based on last modified timestamp. If same timestamp, use filename as a secondary sort, as often // Sort files based on last modified timestamp. If same timestamp, use filename as a secondary sort, as often