[tor-commits] [metrics-web/master] Use a distinct import history file for each importer.

[karsten at torproject.org]

commit 2c9c339af667350504bb021af0f87429ba6aadfb
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Dec 13 15:26:21 2012 +0100

    Use a distinct import history file for each importer.
---
 .../ernie/cron/BridgeStatsFileHandler.java         |    4 ++--
 .../ernie/cron/ConsensusStatsFileHandler.java      |    2 +-
 .../ernie/cron/PerformanceStatsImporter.java       |    2 +-
 .../cron/RelayDescriptorDatabaseImporter.java      |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java
index 085394c..89d65a3 100644
--- a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java
+++ b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java
@@ -374,7 +374,7 @@ public class BridgeStatsFileHandler {
       reader.addDirectory(bridgesDir);
       if (keepBridgeDescriptorImportHistory) {
         reader.setExcludeFiles(new File(statsDirectory,
-            "bridge-descriptor-history"));
+            "bridge-stats-bridge-descriptor-history"));
       }
       Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors();
       while (descriptorFiles.hasNext()) {
@@ -449,7 +449,7 @@ public class BridgeStatsFileHandler {
       reader.addDirectory(archivesDirectory);
       if (keepRelayDescriptorImportHistory) {
         reader.setExcludeFiles(new File(statsDirectory,
-            "relay-descriptor-history"));
+            "bridge-stats-relay-descriptor-history"));
       }
       Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors();
       while (descriptorFiles.hasNext()) {
diff --git a/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java b/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java
index 1fcbf19..934401b 100644
--- a/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java
+++ b/src/org/torproject/ernie/cron/ConsensusStatsFileHandler.java
@@ -183,7 +183,7 @@ public class ConsensusStatsFileHandler {
       reader.addDirectory(bridgesDir);
       if (keepImportHistory) {
         reader.setExcludeFiles(new File(statsDirectory,
-            "bridge-descriptor-history"));
+            "consensus-stats-bridge-descriptor-history"));
       }
       Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors();
       while (descriptorFiles.hasNext()) {
diff --git a/src/org/torproject/ernie/cron/PerformanceStatsImporter.java b/src/org/torproject/ernie/cron/PerformanceStatsImporter.java
index 32d5911..105426b 100644
--- a/src/org/torproject/ernie/cron/PerformanceStatsImporter.java
+++ b/src/org/torproject/ernie/cron/PerformanceStatsImporter.java
@@ -201,7 +201,7 @@ public class PerformanceStatsImporter {
       reader.addDirectory(archivesDirectory);
       if (keepImportHistory) {
         reader.setExcludeFiles(new File(statsDirectory,
-            "connbidirect-relay-descriptor-history"));
+            "performance-stats-relay-descriptor-history"));
       }
       Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors();
       while (descriptorFiles.hasNext()) {
diff --git a/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
index 05c663f..1bbd8d9 100644
--- a/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
+++ b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
@@ -929,7 +929,7 @@ public final class RelayDescriptorDatabaseImporter {
       reader.addDirectory(archivesDirectory);
       if (keepImportHistory) {
         reader.setExcludeFiles(new File(statsDirectory,
-            "relay-descriptor-history"));
+            "database-importer-relay-descriptor-history"));
       }
       Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors();
       while (descriptorFiles.hasNext()) {