[metrics-web/master] Remove remains of fast-exit graphs. - tor-commits

28 Apr 2014

commit 7fa55102add51fc7b072c337aea6fddf077f17f9
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Mon Apr 28 23:40:41 2014 +0200
Remove remains of fast-exit graphs.
---
 website/etc/web.xml                                |    4 --
 .../metrics/web/graphs/GraphsSubpagesServlet.java  |    2 -
 .../metrics/web/research/ResearchStatsServlet.java |    1 -
 website/web/WEB-INF/error.jsp                      |    1 -
 website/web/WEB-INF/fast-exits.jsp                 |   37 ------------------
 website/web/WEB-INF/stats.jsp                      |   40 --------------------
 6 files changed, 85 deletions(-)

diff --git a/website/etc/web.xml b/website/etc/web.xml
index b46ce5a..519a9e6 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -40,10 +40,6 @@
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>GraphsSubpages</servlet-name>
-    <url-pattern>/fast-exits.html</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>GraphsSubpages</servlet-name>
     <url-pattern>/users.html</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
diff --git a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
index 35a6a7a..5ae17ff 100644
--- a/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
+++ b/website/src/org/torproject/metrics/web/graphs/GraphsSubpagesServlet.java
@@ -39,8 +39,6 @@ public class GraphsSubpagesServlet extends HttpServlet {
     this.availableGraphsSubpages = new HashMap<String, String>();
     this.availableGraphsSubpages.put("network.html",
         "WEB-INF/network.jsp");
-    this.availableGraphsSubpages.put("fast-exits.html",
-        "WEB-INF/fast-exits.jsp");
     this.availableGraphsSubpages.put("users.html", "WEB-INF/users.jsp");
     this.availableGraphsSubpages.put("performance.html",
         "WEB-INF/performance.jsp");
diff --git a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
index d1f9cfb..ef566f5 100644
--- a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
+++ b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
@@ -30,7 +30,6 @@ public class ResearchStatsServlet extends HttpServlet {
     this.availableStatisticsFiles = new TreeSet<String>();
     this.availableStatisticsFiles.add("servers");
     this.availableStatisticsFiles.add("bandwidth");
-    this.availableStatisticsFiles.add("fast-exits");
     this.availableStatisticsFiles.add("clients");
     this.availableStatisticsFiles.add("torperf");
     this.availableStatisticsFiles.add("connbidirect");
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index 9c5150e..28065e9 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -44,7 +44,6 @@ Maybe you find what you're looking for on our sitemap:
 <li><a href="graphs.html">Graphs</a>
 <ul>
 <li><a href="network.html">Network</a></li>
-<li><a href="fast-exits.html">Fast Exits</a></li>
 <li><a href="bubbles.html">Bubbles</a></li>
 <li><a href="users.html">Users</a></li>
 <li><a href="performance.html">Performance</a></li>
diff --git a/website/web/WEB-INF/fast-exits.jsp b/website/web/WEB-INF/fast-exits.jsp
deleted file mode 100644
index a5310d0..0000000
--- a/website/web/WEB-INF/fast-exits.jsp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <title>Tor Metrics Portal: Fast Exits</title>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-  <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
-  <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-</head>
-<body>
-  <div class="center">
-    <%@ include file="banner.jsp"%>
-    <div class="main-column">
-<h2>Tor Metrics Portal: Fast Exits</h2>
-<br>
-<p>This page summarized progress in operating 125 fast exits, which was a
-deliverable for
-<a href="https://trac.torproject.org/projects/tor/wiki/org/sponsors/SponsorJ">SponsorJ</a>.</p>
-
-<p>This page is no longer maintained.  You may be interested in the
-following similar graphs:</p>
-
-<ul>
-<li><a href="https://metrics.torproject.org/network.html#advbwdist-perc">Advertised bandwidth distribution</a></li>
-<li><a href="https://metrics.torproject.org/network.html#advbwdist-relay">Advertised bandwidth of n-th fastest relays</a></li>
-</ul>
-
-<p>This page may be removed in the future, so better not bookmark it.</p>
-    </div>
-  </div>
-  <div class="bottom" id="bottom">
-    <%@ include file="footer.jsp"%>
-  </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp
index 0622e73..4e6c9fb 100644
--- a/website/web/WEB-INF/stats.jsp
+++ b/website/web/WEB-INF/stats.jsp
@@ -165,46 +165,6 @@ fastest relays.</li>
 <hr>
 <br>
-<a name="fast-exits"></a>
-<h3><a href="#fast-exits" class="anchor">Relays meeting or almost meeting
-fast-exit requirements</a></h3>
-<br>
-<p><b><font color="red">This file has been deprecated on January 31, 2014
-and will not be available after March 1, 2014.</font></b></p>
-<p>Statistics file <a href="stats/fast-exits.csv">fast-exits.csv</a>
-contains the number of relays meeting or almost meeting fast-exit
-requirements.
-These requirements originate from a Tor sponsor contract and are defined as
-follows:
-a Tor relay is fast if it has at least 95 Mbit/s configured bandwidth
-rate, at least 5000 KB/s advertised bandwidth capacity, and permits
-exiting to ports 80, 443, 554, and 1755; furthermore, there may be at most
-2 relays per /24 network in the set of fast exits.
-Similarly, an almost fast exit is one that almost meets the fast-exit
-requirements, but fails at least one of them.
-In particular, an almost fast exit is one that has at least 80 Mbit/s
-configured bandwidth rate, at least 2000 KB/s advertised bandwidth
-capacity, and permits exiting to ports 80 and 443; also, if there are more
-than 2 relays per /24 network meeting fast-exit requirements, all but two
-are considered almost fast.
-The statistics file contains the following columns:</p>
-
-<ul>
-<li><b>date:</b> UTC date (YYYY-MM-DD) when relays have been listed as
-running.</li>
-<li><b>fastnum:</b> Average number of relays matching fast-exit
-requirements.</li>
-<li><b>almostnum:</b> Average number of relays almost matching
-fast-exit requirements.</li>
-<li><b>fastprob:</b> Total exit probability of all relays matching
-fast-exit requirements.</li>
-<li><b>almostprob:</b> Total exit probability of all relays almost
-matching fast-exit requirements.</li>
-</li>
-</ul>
-<hr>
-<br>
-
 <a name="clients"></a>
 <h3><a href="#clients" class="anchor">Estimated number of clients in the
 Tor network</a></h3>

    