[tor-commits] [metrics-web/master] Don't warn when trying to parse a dir key certificate.

[karsten@xxxxxxxxxxxxxx]

commit f481df454ea82b24f6e627d030c030086e423b9a
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Mon Oct 31 12:58:55 2011 +0100

    Don't warn when trying to parse a dir key certificate.
---
 .../ernie/cron/RelayDescriptorParser.java          |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/org/torproject/ernie/cron/RelayDescriptorParser.java b/src/org/torproject/ernie/cron/RelayDescriptorParser.java
index f2ae02d..64b809e 100644
--- a/src/org/torproject/ernie/cron/RelayDescriptorParser.java
+++ b/src/org/torproject/ernie/cron/RelayDescriptorParser.java
@@ -76,8 +76,12 @@ public class RelayDescriptorParser {
         startToken = "router ";
       } else if (line.startsWith("extra-info ")) {
         startToken = "extra-info ";
+      } else if (line.equals("dir-key-certificate-version 3")) {
+        this.logger.fine("Not parsing dir key certificate.");
+        return;
       } else {
-        this.logger.warning("Unknown descriptor type. Ignoring.");
+        this.logger.warning("Unknown descriptor type.  First line is '"
+            + line + "'.  Ignoring.");
         return;
       }
       String splitToken = "\n" + startToken;

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits