[tor-commits] r26292: {check} short-circuit the tor check, to provide quick answers (check/trunk/cgi-bin)

[Roger Dingledine]

Author: arma
Date: 2013-08-09 15:44:30 +0000 (Fri, 09 Aug 2013)
New Revision: 26292

Modified:
   check/trunk/cgi-bin/TorCheck-off.py
Log:
short-circuit the tor check, to provide quick answers


Modified: check/trunk/cgi-bin/TorCheck-off.py
===================================================================
--- check/trunk/cgi-bin/TorCheck-off.py	2013-08-09 15:24:27 UTC (rev 26291)
+++ check/trunk/cgi-bin/TorCheck-off.py	2013-08-09 15:44:30 UTC (rev 26292)
@@ -48,6 +48,9 @@
 DNS.DiscoverNameServers()
 
 def isUsingTor(clientIp, ELPort):
+    # Short-circuit the check, so we can return quickly.
+    return 2
+
     # This is the exit node ip address
     # This is where we want to dynamically recieve this from Apache
     splitIp = clientIp.split('.')
@@ -298,10 +301,10 @@
         req.write('<img alt="' + _("Sorry, your query failed or an unexpected response was received.") + '" '\
         'src="/images/tor-off.png">\n<br>')
         req.write('<h1 style="color: #A00">\n')
-        req.write(_('Sorry, your query failed or an unexpected response was received.'))
+        req.write(_('Sorry, the check website is temporarily overloaded. (If you are reading this message in Tor Browser Bundle, it is very likely that your Tor is working just fine.)'))
         req.write('<br>\n')
         req.write('</h1>')
-        req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node.'))
+#        req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node.'))
         req.write('<br>\n<br>\n')
 
     # Now we'll close up this html rat hole