Updated Branches: refs/heads/trunk 8ea3f0fb3 -> 082cfb498
FLUME-1929: CheckpointRebuilder main method updated to work for the latest Log format (Hari Shreedharan via Juhani Connolly) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/082cfb49 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/082cfb49 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/082cfb49 Branch: refs/heads/trunk Commit: 082cfb498e95ae95e88d49d357839eab8ab3bf33 Parents: 8ea3f0f Author: Juhani Connolly <[email protected]> Authored: Thu Mar 14 13:32:04 2013 +0900 Committer: Juhani Connolly <[email protected]> Committed: Thu Mar 14 13:32:04 2013 +0900 ---------------------------------------------------------------------- .../flume/channel/file/CheckpointRebuilder.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/082cfb49/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/CheckpointRebuilder.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/CheckpointRebuilder.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/CheckpointRebuilder.java index 6e64003..7883d0e 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/CheckpointRebuilder.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/CheckpointRebuilder.java @@ -238,8 +238,7 @@ public class CheckpointRebuilder { String[] logDirs = cli.getOptionValue("l").split(","); List<File> logFiles = Lists.newArrayList(); for (String logDir : logDirs) { - File[] files = new File(logDir).listFiles(); - logFiles.addAll(Arrays.asList(files)); + logFiles.addAll(LogUtils.getLogs(new File(logDir))); } int capacity = Integer.parseInt(cli.getOptionValue("t")); File checkpointFile = new File(checkpointDir, "checkpoint");
