Skip to content
Snippets Groups Projects
Commit 24a84978 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Avoid DescriptorReader's setExcludeFiles().

parent 2593dce6
No related branches found
No related tags found
No related merge requests found
......@@ -168,7 +168,7 @@ public class ReferenceChecker {
DescriptorReader descriptorReader =
DescriptorSourceFactory.createDescriptorReader();
descriptorReader.addDirectory(this.descriptorsDir);
descriptorReader.setExcludeFiles(this.historyFile);
descriptorReader.setHistoryFile(this.historyFile);
Iterator<DescriptorFile> descriptorFiles =
descriptorReader.readDescriptors();
while (descriptorFiles.hasNext()) {
......@@ -199,6 +199,7 @@ public class ReferenceChecker {
}
}
}
descriptorReader.saveHistoryFile(this.historyFile);
}
private void readRelayNetworkStatusConsensusUnflavored(
......
......@@ -82,9 +82,10 @@ public class SyncManager {
String histFileEnding = entry.getValue().getSimpleName()
+ (entry.getKey().contains("consensus-microdesc")
? "-micro" : "");
descriptorReader.setExcludeFiles(new File(basePath.toFile(),
File historyFile = new File(basePath.toFile(),
"sync-history-" + source.getHost() + "-" + marker + "-"
+ histFileEnding));
+ histFileEnding);
descriptorReader.setHistoryFile(historyFile);
log.info("Reading {} of type {} ... ", marker, histFileEnding);
Iterator<DescriptorFile> descriptorFiles
= descriptorReader.readDescriptors();
......@@ -108,6 +109,7 @@ public class SyncManager {
persist.storeDescs(descFile.getDescriptors(),
descFile.getFile().getName(), collectionDate.getTime());
}
descriptorReader.saveHistoryFile(historyFile);
}
log.info("Done merging {} from {}.", marker, source.getHost());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment