Repaired sincedb initialization

This commit is contained in:
Jan Pichl
2015-12-14 22:16:04 +01:00
parent b6e2b943ca
commit 3040463cce
3 changed files with 5 additions and 10 deletions

View File

@@ -48,7 +48,8 @@ public class FileWatcher {
private boolean stdinConfigured = false;
private String sincedbFile = null;
public FileWatcher() {
public FileWatcher(String sincedbFileName) {
sincedbFile = sincedbFileName;
try {
logger.debug("Loading saved states");
savedStates = Registrar.readStateFromJson(sincedbFile);
@@ -363,9 +364,4 @@ public class FileWatcher {
public void setTail(boolean tail) {
this.tail = tail;
}
public void setSincedb(String sincedbFile) {
this.sincedbFile = sincedbFile;
}
}

View File

@@ -72,10 +72,9 @@ public class Forwarder {
try {
parseOptions(args);
setupLogging();
watcher = new FileWatcher();
watcher = new FileWatcher(sincedbFile);
watcher.setMaxSignatureLength(signatureLength);
watcher.setTail(tailSelected);
watcher.setSincedb(sincedbFile);
configManager = new ConfigurationManager(config);
configManager.readConfiguration();
for(FilesSection files : configManager.getConfig().getFiles()) {

View File

@@ -46,7 +46,7 @@ public class FileWatcherTest {
//@Test
public void testFileWatch() throws InterruptedException, IOException {
FileWatcher watcher = new FileWatcher();
FileWatcher watcher = new FileWatcher(".logstash-forwarder-java");
watcher.addFilesToWatch("./test.txt", new Event().addField("test", "test"), FileWatcher.ONE_DAY);
for(int i = 0; i < 100; i++) {
Thread.sleep(1000);
@@ -60,7 +60,7 @@ public class FileWatcherTest {
logger.warn("Not executing this test on windows");
return;
}
FileWatcher watcher = new FileWatcher();
FileWatcher watcher = new FileWatcher(".logstash-forwarder-java");
watcher.addFilesToWatch("./testFileWatcher*.txt", new Event().addField("test", "test"), FileWatcher.ONE_DAY);
watcher.initialize();