commit 9a8f9f1508eaf5e812d18afe2cb6fa79ba614b73 Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat May 17 08:35:45 2014 +0200
Switch tarballs to .tar.xz.
Implements #11788. --- .../torproject/metrics/web/research/ResearchDataServlet.java | 7 ++++++- website/web/WEB-INF/data.jsp | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java index f4db150..9006ebf 100644 --- a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java +++ b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java @@ -96,6 +96,11 @@ public class ResearchDataServlet extends HttpServlet { continue; } String filename = url.substring(url.lastIndexOf("/") + 1); + /* TODO Remove the following once we stop providing .tar.bz2 + * files. */ + if (filename.endsWith(".tar.bz2")) { + continue; + }
/* URL contains relay descriptors. */ if (filename.startsWith("tor-20") || @@ -147,7 +152,7 @@ public class ResearchDataServlet extends HttpServlet { bridgeDescriptors.get(month)[index] = url;
/* URL contains relay statistics. */ - } else if (filename.startsWith("relay-statistics.tar.bz2")) { + } else if (filename.startsWith("relay-statistics.tar")) { int index = filename.endsWith(".asc") ? 1 : 0; relayStatistics[index] = url;
diff --git a/website/web/WEB-INF/data.jsp b/website/web/WEB-INF/data.jsp index 40475f7..37e49bd 100644 --- a/website/web/WEB-INF/data.jsp +++ b/website/web/WEB-INF/data.jsp @@ -32,6 +32,9 @@ <p>The tarballs listed on this page and the raw files that were published on the last three days are also available via "rsync metrics.torproject.org::".</p> + <p>Note that most descriptors compress really well. You should + expect tarballs to decompress to 20 times the compressed size or + even more.</p> <br> <a name="relaydesc"></a> <h3><a href="#relaydesc" class="anchor">Relay descriptor