[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r18733: {website} If the mirror doesn't respond or doesn't have the updated tr (in website/trunk: . include)



Author: phobos
Date: 2009-03-01 21:50:39 -0500 (Sun, 01 Mar 2009)
New Revision: 18733

Modified:
   website/trunk/include/mirrors-table.wmi
   website/trunk/update-mirrors.pl
Log:
If the mirror doesn't respond or doesn't have the updated trace file,
don't list it.


Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi	2009-03-02 02:24:41 UTC (rev 18732)
+++ website/trunk/include/mirrors-table.wmi	2009-03-02 02:50:39 UTC (rev 18733)
@@ -256,255 +256,255 @@
      
 <tr>
 
-         <td>CA</td>
+         <td></td>
 
-         <td>Depthstrike</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tor.depthstrike.com/dist/";>http</a></td>
-    <td><a href="http://tor.depthstrike.com/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>NL</td>
+         <td></td>
 
-         <td>OS Mirror</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
-    <td><a href="ftp://ftp.osmirror.nl/pub/tor/";>ftp</a></td>
-    <td><a href="http://tor.osmirror.nl/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
-    <td><a href="rsync://rsync.osmirror.nl::tor/">rsync</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>DK</td>
+         <td></td>
 
-         <td>Zentrum der Gesundheit</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tor.zdg-gmbh.eu/dist/";>http</a></td>
-    <td><a href="http://tor.zdg-gmbh.eu/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>DE</td>
+         <td></td>
 
-         <td>Spline</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://rem.spline.de/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>AU</td>
+         <td></td>
 
-         <td>Wiretapped</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
-    <td><a href="ftp://ftp.mirrors.wiretapped.net/pub/security/cryptography/network/tor/";>ftp</a></td>
-    <td><a href="http://www.mirrors.wiretapped.net/security/cryptography/network/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>NO</td>
+         <td></td>
 
-         <td>Meulie</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tor.meulie.net/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>DE</td>
+         <td></td>
 
-         <td>Cybermirror</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tor.cybermirror.org/dist/";>http</a></td>
-    <td><a href="http://tor.cybermirror.org/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>US</td>
+         <td></td>
 
-         <td>BJWOnline</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://mirror.bjwonline.com/tor/dist/";>http</a></td>
-    <td><a href="http://mirror.bjwonline.com/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>CN</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://free.be.ijing2008.cn/tor/dist/";>http</a></td>
-    <td><a href="http://free.be.ijing2008.cn/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>NL</td>
+         <td></td>
 
-         <td>BIT BV</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
-    <td><a href="ftp://ftp.bit.nl/mirror/tor/";>ftp</a></td>
-    <td><a href="http://ftp.bit.nl/mirror/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>UK</td>
+         <td></td>
 
-         <td>Ghirai</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://www.ghirai.com/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>UA</td>
+         <td></td>
 
-         <td>Technica-03</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tordistua.reactor-xg.kiev.ua";>http</a></td>
-    <td><a href="http://torua.reactor-xg.kiev.ua/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>FR</td>
+         <td></td>
 
-         <td>CRAN</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
-    <td><a href="ftp://miroir-francais.fr/pub/tor/";>ftp</a></td>
-    <td><a href="http://tor.miroir-francais.fr/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
-    <td><a href="rsync://miroir-francais.fr::tor">rsync</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>AT</td>
+         <td></td>
 
-         <td>Cypherpunks</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://tor.cypherpunks.at/dist/";>http</a></td>
-    <td><a href="http://tor.cypherpunks.at/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
-    <td><a href="rsync://tor.cypherpunks.at/tor">rsync</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>
      
 <tr>
 
-         <td>DE</td>
+         <td></td>
 
-         <td>Berapla</td>
+         <td></td>
 
-         <td>Unknown</td>
+         <td></td>
 
     <td> - </td>
-    <td><a href="http://download.berapla.de/mirrors/tor/dist/";>http</a></td>
-    <td><a href="http://download.berapla.de/mirrors/tor/";>http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
+    <td> - </td>
+    <td> - </td>
 </tr>

Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl	2009-03-02 02:24:41 UTC (rev 18732)
+++ website/trunk/update-mirrors.pl	2009-03-02 02:50:39 UTC (rev 18733)
@@ -16,7 +16,7 @@
 print "Creating LWP agent ($LWP::VERSION)...\n";
 my $lua = LWP::UserAgent->new(
     keep_alive => 1,
-    timeout => 15,
+    timeout => 30,
     agent => "Tor MirrorCheck Agent"
 );
 
@@ -666,8 +666,8 @@
      if( "$m{$server}{'updateDate'}" ne "Unknown") {
         $time = ctime($m{$server}{'updateDate'});
         chomp($time);
-     } else { $time = "Unknown"; }
-
+     } else { delete $m{$server}; }
+# } else { $time = "Unknown"; }
 print OUT <<"END";
      \n<tr>\n
          <td>$m{$server}{'isoCC'}</td>\n