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

Tone down a warning about outdated assignments.

Browse Source
This commit is contained in:
Karsten Loesing 2019-09-19 11:08:41 +02:00
parent b2b3363232
commit 54ac654d40
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java
View File

@ -115,11 +115,19 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain {
logger.info("Starting bridge-pool-assignments module of CollecTor.");
this.initializeConfiguration();
List<File> assignmentFiles = this.listAssignmentFiles();
LocalDateTime latestPublished = null;
for (File assignmentFile : assignmentFiles) {
logger.info("Processing bridge pool assignment file '{}'...",
assignmentFile.getAbsolutePath());
SortedMap<LocalDateTime, SortedMap<String, String>>
readBridgePoolAssignments
= this.readBridgePoolAssignments(assignmentFile);
if (null == latestPublished
|| readBridgePoolAssignments.lastKey().isAfter(latestPublished)) {
latestPublished = readBridgePoolAssignments.lastKey();
}
for (Map.Entry<LocalDateTime, SortedMap<String, String>> e
: this.readBridgePoolAssignments(assignmentFile).entrySet()) {
: readBridgePoolAssignments.entrySet()) {
LocalDateTime published = e.getKey();
SortedMap<String, String> originalAssignments = e.getValue();
SortedMap<String, String> sanitizedAssignments
@ -144,6 +152,12 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain {
}
}
}
if (null != latestPublished
&& latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) {
logger.warn("The last known bridge pool assignment list was "
+ "published at {}, which is more than 5:30 hours in the past.",
latestPublished);
}
this.cleanUpRsyncDirectory();
logger.info("Finished processing bridge pool assignment file(s).");
}
@ -251,13 +265,6 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain {
logger.warn("Could not read bridge pool assignment file '{}'. "
+ "Skipping.", assignmentFile.getAbsolutePath(), e);
}
if (!readBridgePoolAssignments.isEmpty()
&& readBridgePoolAssignments.lastKey().minusMinutes(330L)
.isBefore(LocalDateTime.now())) {
logger.warn("The last known bridge pool assignment list was "
+ "published at {}, which is more than 5:30 hours in the past.",
readBridgePoolAssignments.lastKey());
}
return readBridgePoolAssignments;
}