You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ju...@apache.org on 2013/03/14 05:30:45 UTC
git commit: FLUME-1929: CheckpointRebuilder main method updated to
work for the latest Log format
Updated Branches:
refs/heads/flume-1.4 97855decb -> 113dcdca6
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/113dcdca
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/113dcdca
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/113dcdca
Branch: refs/heads/flume-1.4
Commit: 113dcdca67c164e6d633fc8d9ce8d8d616e49e63
Parents: 97855de
Author: Juhani Connolly <ju...@cyberagent.co.jp>
Authored: Thu Mar 14 13:00:12 2013 +0900
Committer: Juhani Connolly <ju...@cyberagent.co.jp>
Committed: Thu Mar 14 13:00:12 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/113dcdca/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");