[metrics-db/master] Don't feed relay descriptors into ConsensusStatsFileHandler anymore.

commit a900e6b8289a19a155c406195212f0f552ec51b8
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Jan 13 16:15:33 2011 +0100

    Don't feed relay descriptors into ConsensusStatsFileHandler anymore.
---
 src/org/torproject/ernie/db/Main.java              |   21 ++++++++++---------
 .../torproject/ernie/db/RelayDescriptorParser.java |   13 ++---------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java
index 6110ec0..ab214f2 100644
--- a/src/org/torproject/ernie/db/Main.java
+++ b/src/org/torproject/ernie/db/Main.java
@@ -29,11 +29,7 @@ public class Main {
       System.exit(1);
     }
 
-    // Prepare stats file handlers (only if we are writing stats)
-    ConsensusStatsFileHandler csfh = config.getWriteConsensusStats() ?
-        new ConsensusStatsFileHandler(
-        config.getWriteAggregateStatsDatabase() ?
-        config.getRelayDescriptorDatabaseJDBC() : null) : null;
+    // Prepare bridge stats file handler
     BridgeStatsFileHandler bsfh = config.getWriteBridgeStats() ?
         new BridgeStatsFileHandler(
         config.getWriteAggregateStatsDatabase() ?
@@ -60,13 +56,12 @@ public class Main {
 
     // Prepare relay descriptor parser (only if we are writing stats or
     // directory archives to disk)
-    RelayDescriptorParser rdp = config.getWriteConsensusStats() ||
-        config.getWriteBridgeStats() ||
+    RelayDescriptorParser rdp = config.getWriteBridgeStats() ||
         config.getWriteDirectoryArchives() ||
         config.getWriteRelayDescriptorDatabase() ||
         config.getWriteRelayDescriptorsRawFiles() ||
         config.getWriteConsensusHealth() ?
-        new RelayDescriptorParser(csfh, bsfh, aw, rddi, chc) : null;
+        new RelayDescriptorParser(bsfh, aw, rddi, chc) : null;
 
     // Import/download relay descriptors from the various sources
     if (rdp != null) {
@@ -74,8 +69,8 @@ public class Main {
       if (config.getDownloadRelayDescriptors()) {
         List<String> dirSources =
             config.getDownloadFromDirectoryAuthorities();
-        boolean downloadCurrentConsensus = aw != null || csfh != null ||
-            bsfh != null || rddi != null || chc != null;
+        boolean downloadCurrentConsensus = aw != null || bsfh != null ||
+            rddi != null || chc != null;
         boolean downloadCurrentVotes = aw != null || chc != null;
         boolean downloadAllServerDescriptors = aw != null ||
             rddi != null;
@@ -127,6 +122,12 @@ public class Main {
       aw = null;
     }
 
+    // Prepare consensus stats file handler
+    ConsensusStatsFileHandler csfh = config.getWriteConsensusStats() ?
+        new ConsensusStatsFileHandler(
+        config.getWriteAggregateStatsDatabase() ?
+        config.getRelayDescriptorDatabaseJDBC() : null) : null;
+
     // Prepare sanitized bridge descriptor writer
     SanitizedBridgesWriter sbw = config.getWriteSanitizedBridges() ?
         new SanitizedBridgesWriter(
diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java
index f2cdfed..14bfc20 100644
--- a/src/org/torproject/ernie/db/RelayDescriptorParser.java
+++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java
@@ -18,12 +18,6 @@ import org.apache.commons.codec.binary.*;
 public class RelayDescriptorParser {
 
   /**
-   * Stats file handler that accepts parse results for consensus
-   * statistics.
-   */
-  private ConsensusStatsFileHandler csfh;
-
-  /**
    * Stats file handler that accepts parse results for bridge statistics.
    */
   private BridgeStatsFileHandler bsfh;
@@ -58,10 +52,9 @@ public class RelayDescriptorParser {
   /**
    * Initializes this class.
    */
-  public RelayDescriptorParser(ConsensusStatsFileHandler csfh,
-      BridgeStatsFileHandler bsfh, ArchiveWriter aw,
-      RelayDescriptorDatabaseImporter rddi, ConsensusHealthChecker chc) {
-    this.csfh = csfh;
+  public RelayDescriptorParser(BridgeStatsFileHandler bsfh,
+      ArchiveWriter aw, RelayDescriptorDatabaseImporter rddi,
+      ConsensusHealthChecker chc) {
     this.bsfh = bsfh;
     this.aw = aw;
     this.rddi = rddi;