[or-cvs] r20500: {torflow} Demote a common ERROR line due to socks timeout. (torflow/branches/stable/NetworkScanners/BwAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-09-08 15:26:51 -0400 (Tue, 08 Sep 2009)
New Revision: 20500

Modified:
   torflow/branches/stable/NetworkScanners/BwAuthority/bwauthority.py
Log:

Demote a common ERROR line due to socks timeout.



Modified: torflow/branches/stable/NetworkScanners/BwAuthority/bwauthority.py
===================================================================
--- torflow/branches/stable/NetworkScanners/BwAuthority/bwauthority.py	2009-09-08 14:43:23 UTC (rev 20499)
+++ torflow/branches/stable/NetworkScanners/BwAuthority/bwauthority.py	2009-09-08 19:26:51 UTC (rev 20500)
@@ -334,6 +334,13 @@
     return 0
   except KeyboardInterrupt:
     raise KeyboardInterrupt
+  except socks.Socks5Error, e:
+    if e.value[0] == 6:
+      plog("NOTICE", "Tor timed out our SOCKS stream request.")
+    else:
+      plog('ERROR', 'An unknown HTTP error occured')
+      traceback.print_exc()
+    return 0
   except:
     plog('ERROR', 'An unknown HTTP error occured')
     traceback.print_exc()
@@ -450,7 +457,7 @@
                 max_fetch_time, sleep_start, sleep_stop, slice_num,
                 min_streams, sql_file)
 
-      # XXX: Temporary for debugging memory leak..
+      # For debugging memory leaks..
       #TorUtil.dump_class_ref_counts(referrer_depth=1)
 
       # TODO: Change pathlen to 3 and kill exit+ConserveExit restrictions