[tor-commits] [doctor/master] Resume using descriptor compression

[atagar at torproject.org]

commit a8e954f7b0d6798afa1333ba2c7ec645f0e4ae04
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Mar 11 08:57:47 2015 -0700

    Resume using descriptor compression
    
    We explicitly opted for plaintext requests in c7bd070 because compressed
    queries had a truncated response. Sounds from #11648 like things should be
    working now. Giving this a shot.
---
 consensus_health_checker.py |    6 +++---
 descriptor_checker.py       |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/consensus_health_checker.py b/consensus_health_checker.py
index e7e2ca0..b807497 100755
--- a/consensus_health_checker.py
+++ b/consensus_health_checker.py
@@ -700,7 +700,7 @@ def get_consensuses():
   :returns: tuple of the form ({authority => consensus}, issues)
   """
 
-  return _get_documents('consensus', '/tor/status-vote/current/consensus')
+  return _get_documents('consensus', '/tor/status-vote/current/consensus.z')
 
 
 def get_votes():
@@ -710,7 +710,7 @@ def get_votes():
   :returns: tuple of the form ({authority => vote}, issues)
   """
 
-  return _get_documents('vote', '/tor/status-vote/current/authority')
+  return _get_documents('vote', '/tor/status-vote/current/authority.z')
 
 
 def _get_documents(label, resource):
@@ -737,7 +737,7 @@ def _get_documents(label, resource):
         v3ident = DIRECTORY_AUTHORITIES[authority].v3ident
 
         query = downloader.query(
-          '/tor/status-vote/current/%s' % v3ident,
+          '/tor/status-vote/current/%s.z' % v3ident,
           default_params = False,
           validate = True,
         )
diff --git a/descriptor_checker.py b/descriptor_checker.py
index 57aeeab..309379e 100755
--- a/descriptor_checker.py
+++ b/descriptor_checker.py
@@ -36,8 +36,8 @@ def main():
   # retrieve the server and extrainfo descriptors from any authority
 
   targets = [
-    ('server descriptors', '/tor/server/all'),
-    ('extrainfo descriptors', '/tor/extra/all'),
+    ('server descriptors', '/tor/server/all.z'),
+    ('extrainfo descriptors', '/tor/extra/all.z'),
   ]
 
   for descriptor_type, resource in targets:
@@ -73,7 +73,7 @@ def main():
     log.debug("Downloading the consensus from %s..." % authority.nickname)
 
     query = stem.descriptor.remote.Query(
-      '/tor/status-vote/current/consensus',
+      '/tor/status-vote/current/consensus.z',
       block = True,
       timeout = 60,
       endpoints = [(authority.address, authority.dir_port)],