[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [metrics-web/master] Remove GetTor statistics from metrics website to see if anybody cares.
commit ac054f13d56fcbe06abec075c67d5879c560b5ce
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Wed Jul 25 13:34:26 2012 +0200
Remove GetTor statistics from metrics website to see if anybody cares.
Implements part of #6395. See the reasoning behind removing GetTor
statistics there.
The data import part is not removed yet, so if we re-decide about taking
GetTor statistics out, we can simply reverse this patch and redeploy.
---
etc/web.xml | 4 ---
web/WEB-INF/banner.jsp | 4 ---
web/WEB-INF/data.jsp | 11 --------
web/WEB-INF/formats.jsp | 40 +-----------------------------
web/WEB-INF/graphs.jsp | 3 --
web/WEB-INF/packages.jsp | 62 ----------------------------------------------
6 files changed, 1 insertions(+), 123 deletions(-)
diff --git a/etc/web.xml b/etc/web.xml
index 24f3ba2..cc9c3d5 100644
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -207,10 +207,6 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>GraphImage</servlet-name>
- <url-pattern>/gettor.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>GraphImage</servlet-name>
<url-pattern>/torperf.png</url-pattern>
</servlet-mapping>
<servlet-mapping>
diff --git a/web/WEB-INF/banner.jsp b/web/WEB-INF/banner.jsp
index c31875d..38ed77f 100644
--- a/web/WEB-INF/banner.jsp
+++ b/web/WEB-INF/banner.jsp
@@ -17,7 +17,6 @@
<%if (currentPage.endsWith("graphs.jsp") ||
currentPage.endsWith("network.jsp") ||
currentPage.endsWith("users.jsp") ||
- currentPage.endsWith("packages.jsp") ||
currentPage.endsWith("performance.jsp")) {
%><br>
<font size="2">
@@ -27,9 +26,6 @@
<a <%if (currentPage.endsWith("users.jsp")) {
%>class="current"<%} else {%>href="/users.html"<%}
%>>Users</a>
- <a <%if (currentPage.endsWith("packages.jsp")) {
- %>class="current"<%} else {%>href="/packages.html"<%}
- %>>Packages</a>
<a <%if (currentPage.endsWith("performance.jsp")) {
%>class="current"<%} else {%>href="/performance.html"<%}
%>>Performance</a>
diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp
index a1d0b49..06176db 100644
--- a/web/WEB-INF/data.jsp
+++ b/web/WEB-INF/data.jsp
@@ -28,7 +28,6 @@
<li><a href="#bridgeassignments">Bridge pool assignments</a></li>
<li><a href="#performance">Performance data</a></li>
<li><a href="#exitlist">Exit lists</a></li>
- <li><a href="#gettor">GetTor statistics file</a></li>
</ul>
<p>The tarballs listed on this page and the raw files that were
published on the last three days are also available via
@@ -278,16 +277,6 @@
</tr>
</c:forEach>
</table>
- <br>
- <a name="gettor"></a>
- <h3><a href="#gettor" class="anchor">GetTor statistics
- file</a></h3>
- <br>
- <p>GetTor allows users to fetch the Tor software via email.
- This <a href="data/gettor_stats.txt">file</a> contains statistics
- on the number of packages requested from GetTor per day.
- The data format is described
- <a href="formats.html#gettor">here</a>.</p>
</div>
</div>
<div class="bottom" id="bottom">
diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp
index 98f928b..722ef29 100644
--- a/web/WEB-INF/formats.jsp
+++ b/web/WEB-INF/formats.jsp
@@ -37,8 +37,7 @@ including
<a href="#exitstats">exit-port statistics</a>, and
<a href="#bidistats">bidirectional connection use</a>.</li>
<li>Third, we delineate the output of various Tor services like
-<a href="#bridgepool">BridgeDB</a>,
-<a href="#gettor">GetTor</a>, or
+<a href="#bridgepool">BridgeDB</a>, or
<a href="#exitlist">Tor Check</a> as well as specific measurement tools like
<a href="#torperf">Torperf</a>.</li>
</ol>
@@ -88,7 +87,6 @@ are recent:
<tt>transport</tt> lines</li>
<li><tt>@type torperf 1.0</tt></li>
<li><tt>@type bridge-pool-assignment 1.0</tt></li>
-<li><tt>@type gettor 1.0</tt></li>
<li><tt>@type tordnsel 1.0</tt></li>
</ul>
@@ -922,42 +920,6 @@ OR port or relay flag which is defined by <tt>port=$port</tt> and/or
<hr>
<br>
-<a name="gettor"></a>
-<h3><a href="#gettor" class="anchor">GetTor statistics file</a></h3>
-<br>
-<p>
-GetTor allows users to fetch the Tor software via email.
-GetTor keeps internal statistics on the number of packages requested
-every day and writes these statistics to a file.
-The document below shows the statistics file for December 27, 2010.
-The <tt>None</tt> entry stands for requests that don't ask for a specific
-bundle, e.g. requests for the bundle list.
-</p>
-
-<blockquote>
-<p>
-<i>GetTor statistics file for December 27, 2010:</i>
-</p>
-<p>
-<tt>2010-12-27 - None:167 macosx-i386-bundle:0 macosx-ppc-bundle:0
-source-bundle:2 tor-browser-bundle:0 tor-browser-bundle_ar:0
-tor-browser-bundle_de:0 tor-browser-bundle_en:39
-tor-browser-bundle_es:0 tor-browser-bundle_fa:5
-tor-browser-bundle_fr:0 tor-browser-bundle_it:0
-tor-browser-bundle_nl:0 tor-browser-bundle_pl:0
-tor-browser-bundle_pt:0 tor-browser-bundle_ru:0
-tor-browser-bundle_zh_CN:77 tor-im-browser-bundle:0
-tor-im-browser-bundle_ar:0 tor-im-browser-bundle_de:0
-tor-im-browser-bundle_en:1 tor-im-browser-bundle_es:0
-tor-im-browser-bundle_fa:0 tor-im-browser-bundle_fr:0
-tor-im-browser-bundle_it:0 tor-im-browser-bundle_nl:0
-tor-im-browser-bundle_pl:0 tor-im-browser-bundle_pt:0
-tor-im-browser-bundle_ru:0 tor-im-browser-bundle_zh_CN:0</tt>
-</p>
-</blockquote>
-<hr>
-<br>
-
<a name="exitlist">
<h3><a href="#exitlist" class="anchor">Tor Check exit lists</a></h3>
<br>
diff --git a/web/WEB-INF/graphs.jsp b/web/WEB-INF/graphs.jsp
index ae940a2..58c122c 100644
--- a/web/WEB-INF/graphs.jsp
+++ b/web/WEB-INF/graphs.jsp
@@ -20,9 +20,6 @@
statistics on the network of relays and bridges.</li>
<li>The <a href="users.html">Users page</a> attempts to estimate
the number of users in the network.</li>
- <li>There are numerous ways to download the Tor software. The
- <a href="packages.html">Packages page</a> has statistics on the
- number of packages requested from GetTor.</li>
<li>There are active and passive performance measurements of the
Tor network available on the
<a href="performance.html">Performance page</a>.</li>
diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp
deleted file mode 100644
index afe5e50..0000000
--- a/web/WEB-INF/packages.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics Portal: Packages</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: Packages</h2>
-<br>
-<a name="gettor"></a>
-<h3><a href="#gettor" class="anchor">Packages requested from GetTor</a></h3>
-<br>
-<p>GetTor allows users to fetch the Tor software via email. The following
-graph shows the number of packages requested from GetTor per day.</p>
-<p>
-<img src="gettor.png${gettor_url}"
- width="576" height="360" alt="GetTor graph">
-<form action="packages.html#gettor">
- <div class="formrow">
- <input type="hidden" name="graph" value="gettor">
- <p>
- <label>Start date (yyyy-mm-dd):</label>
- <input type="text" name="start" size="10"
- value="<c:choose><c:when test="${fn:length(gettor_start) == 0}">${default_start_date}</c:when><c:otherwise>${gettor_start[0]}</c:otherwise></c:choose>">
- <label>End date (yyyy-mm-dd):</label>
- <input type="text" name="end" size="10"
- value="<c:choose><c:when test="${fn:length(gettor_end) == 0}">${default_end_date}</c:when><c:otherwise>${gettor_end[0]}</c:otherwise></c:choose>">
- </p><p>
- Language: <select name="language">
- <option value="all"<c:if test="${fn:length(gettor_language) == 0 or gettor_language[0] eq 'all'}"> selected</c:if>>All languages</option>
- <option value="en"<c:if test="${gettor_language[0] eq 'en'}"> selected</c:if>>English (en)</option>
- <option value="zh_CN"<c:if test="${gettor_language[0] eq 'zh_CN'}"> selected</c:if>>Simplified Chinese (zh_CN)</option>
- <option value="fa"<c:if test="${gettor_language[0] eq 'fa'}"> selected</c:if>>Farsi (fa)</option>
- </select>
- </p><p>
- Resolution: <select name="dpi">
- <option value="72"<c:if test="${gettor_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option>
- <option value="150"<c:if test="${gettor_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>
- <option value="300"<c:if test="${gettor_dpi[0] eq '300'}"> selected</c:if>>Print high - 2400x1500</option>
- </select>
- </p><p>
- <input class="submit" type="submit" value="Update graph">
- </p>
- </div>
-</form>
-
-<p><a href="csv/gettor.csv">CSV</a> file containing all data.</p>
-<br>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits