torproject/collector
1
0
Fork 0
mirror of https://github.com/torproject/collector.git synced 2024-11-27 03:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a different history file for micro-consensus descriptors.

Browse Source
This commit is contained in:
iwakeh 2016-10-25 17:43:57 +02:00
parent 5c862a18f2
commit f4cb959d1e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/torproject/collector/sync/SyncManager.java
View File

@ -78,15 +78,16 @@ public class SyncManager {
DescriptorReader descriptorReader
= DescriptorSourceFactory.createDescriptorReader();
descriptorReader.addDirectory(new File(base, entry.getKey()));
String histFileEnding = entry.getValue().getSimpleName()
+ (entry.getKey().contains("consensus-microdesc")
? "-micro" : "");
descriptorReader.setExcludeFiles(new File(basePath.toFile(),
"sync-history-" + source.getHost() + "-" + marker + "-"
+ entry.getValue().getSimpleName()));
log.info("Reading {} of type {} ... ", marker,
entry.getValue().getSimpleName());
+ histFileEnding));
log.info("Reading {} of type {} ... ", marker, histFileEnding);
Iterator<DescriptorFile> descriptorFiles
= descriptorReader.readDescriptors();
log.info("Done reading {} of type {}.",
marker, entry.getValue().getSimpleName());
log.info("Done reading {} of type {}.", marker, histFileEnding);
Criterium crit = new ProcessCriterium(entry.getValue());
while (descriptorFiles.hasNext()) {
DescriptorFile descFile = descriptorFiles.next();