[tor-commits] [doctor/master] Suppressing another message for malformed dirreq-v3-ips lines

atagar at torproject.org atagar at torproject.org
Wed Jun 22 15:19:34 UTC 2016


commit 096fab93e1d45f552f29b3f43f88684d8b14a543
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Jun 22 08:20:56 2016 -0700

    Suppressing another message for malformed dirreq-v3-ips lines
    
    Oops, Stem is hitting another exception for the malformed dirreq-v3-ips lines.
    Understandable - suppressing that too.
---
 descriptor_checker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/descriptor_checker.py b/descriptor_checker.py
index 91fd825..d234008 100755
--- a/descriptor_checker.py
+++ b/descriptor_checker.py
@@ -53,7 +53,7 @@ def main():
     if not query.error:
       count = len(list(query))
       log.debug("  %i descriptors retrieved from %s in %0.2fs" % (count, query.download_url, query.runtime))
-    elif "'dirreq-v3-ips' line had non-ascii content" in str(query.error):
+    elif "'dirreq-v3-ips' line had non-ascii content" in str(query.error) or "Entries in dirreq-v3-ips line should only be" in str(query.error):
       log.debug("Suppressing error due to malformed dirreq-v3-ips line: https://trac.torproject.org/projects/tor/ticket/16858")
     else:
       log.warn("Unable to retrieve the %s: %s" % (descriptor_type, query.error))



More information about the tor-commits mailing list