[tor-commits] [metrics-web/master] Disable descriptor.html to see if anyone cares.

[karsten@xxxxxxxxxxxxxx]

commit 89abd4af90f0040180fc81ce16e4f15339f5c433
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Thu Mar 8 16:05:19 2012 +0100

    Disable descriptor.html to see if anyone cares.
    
    If not, dump it.  It's yet one more thing to maintain.
---
 etc/web.xml                                        |    2 ++
 .../torproject/ernie/web/RelaySearchServlet.java   |    2 +-
 web/robots.txt                                     |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/web.xml b/etc/web.xml
index 417ab62..fa6274d 100644
--- a/etc/web.xml
+++ b/etc/web.xml
@@ -287,6 +287,7 @@
     <url-pattern>/extrainfodesc</url-pattern>
   </servlet-mapping>
 
+<!--
   <servlet>
     <servlet-name>Descriptor</servlet-name>
     <servlet-class>
@@ -297,6 +298,7 @@
     <servlet-name>Descriptor</servlet-name>
     <url-pattern>/descriptor.html</url-pattern>
   </servlet-mapping>
+-->
 
   <servlet>
     <servlet-name>Consensus</servlet-name>
diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java
index fe7e62b..f93dc14 100644
--- a/src/org/torproject/ernie/web/RelaySearchServlet.java
+++ b/src/org/torproject/ernie/web/RelaySearchServlet.java
@@ -434,7 +434,7 @@ public class RelaySearchServlet extends HttpServlet {
                   new BigInteger(1, Base64.decodeBase64(parts[3]
                   + "==")));
               rawStatusEntryBuilder.append("<tt>r " + parts[1] + " "
-                  + parts[2] + " <a href=\"descriptor.html?desc-id="
+                  + parts[2] + " <a href=\"serverdesc?desc-id="
                   + descriptorBase64 + "\" target=\"_blank\">" + parts[3]
                   + "</a> " + parts[4] + " " + parts[5] + " " + parts[6]
                   + " " + parts[7] + " " + parts[8] + "</tt><br>");
diff --git a/web/robots.txt b/web/robots.txt
index 3b8e76e..137673c 100644
--- a/web/robots.txt
+++ b/web/robots.txt
@@ -5,7 +5,6 @@ Disallow: /relay.html
 Disallow: /csv/
 Disallow: /serverdesc
 Disallow: /extrainfodesc
-Disallow: /descriptor.html
 Disallow: /consensus
 Disallow: /votes
 Disallow: /consensus-health.html



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