[tor-commits] [metrics-web/master] Remove logic for listing tarballs from other servers on data.html.

[karsten@xxxxxxxxxxxxxx]

commit da6857f3a7ca9282f395b6ca06295ac1c8237901
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Tue Aug 21 13:52:06 2012 +0200

    Remove logic for listing tarballs from other servers on data.html.
    
    We're not using this code since March 2011.
---
 etc/web.xml                                        |    6 -----
 .../torproject/ernie/web/ResearchDataServlet.java  |   24 --------------------
 2 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/etc/web.xml b/etc/web.xml
index 1425d2b..0931a71 100644
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -72,12 +72,6 @@
       org.torproject.ernie.web.ResearchDataServlet
     </servlet-class>
     <init-param>
-      <param-name>remoteDataFiles</param-name>
-      <param-value>
-        /srv/metrics.torproject.org/web/remote-files-for-data-page
-      </param-value>
-    </init-param>
-    <init-param>
       <param-name>localDataDir</param-name>
       <param-value>
         /srv/metrics.torproject.org/db/data/
diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java
index 8adb06c..23688b2 100644
--- a/src/org/torproject/ernie/web/ResearchDataServlet.java
+++ b/src/org/torproject/ernie/web/ResearchDataServlet.java
@@ -37,30 +37,6 @@ public class ResearchDataServlet extends HttpServlet {
   public void doGet(HttpServletRequest request,
       HttpServletResponse response) throws IOException, ServletException {
 
-    /* Read file with URLs of metrics data files on other servers. */
-    List<String> dataFileUrls = new ArrayList<String>();
-    String remoteDataFiles = getServletConfig().getInitParameter(
-        "remoteDataFiles");
-    if (remoteDataFiles != null) {
-      try {
-        File remoteDataFilesFile = new File(remoteDataFiles);
-        if (remoteDataFilesFile.exists() &&
-            !remoteDataFilesFile.isDirectory()) {
-          BufferedReader br = new BufferedReader(new FileReader(
-              remoteDataFilesFile));
-          String line = null;
-          while ((line = br.readLine()) != null) {
-            if (!line.startsWith("#")) {
-              dataFileUrls.add(line);
-            }
-          }
-          br.close();
-        }
-      } catch (SecurityException e) {
-        /* We're not permitted to read the file with URLs. Ignore. */
-      }
-    }
-
     /* Read local directory with files served by the local Apache HTTP
      * server and add the URLs to the list. */
     String localDataDir = getServletConfig().getInitParameter(

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits