[or-cvs] r19598: {torflow} More logs. Also, I hate you python. You know I'm trying to c (torflow/trunk/NetworkScanners/BwAuthority)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-05-30 18:32:36 -0400 (Sat, 30 May 2009)
New Revision: 19598

Modified:
   torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py
Log:

More logs. Also, I hate you python. You know I'm trying to
concatinate a string and an int, but instead of just doing
it, you mock me with an exception. Other languages can figure
out what to do.  What's wrong with you??



Modified: torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py	2009-05-30 22:22:46 UTC (rev 19597)
+++ torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py	2009-05-30 22:32:36 UTC (rev 19598)
@@ -348,7 +348,9 @@
     # causes some exits to hang forever on streams :(
     timer = threading.Timer(max_fetch_time, lambda: hdlr.close_streams(7))
     timer.start()
-    ret = http_request(choose_url(start_pct))
+    url = choose_url(start_pct)
+    plog("DEBUG", "Launching stream request for url "+url+" in "+str(start_pct)+'-'+str(stop_pct) + '%')
+    ret = http_request(url)
     timer.cancel()
 
     delta_build = time.time() - t0
@@ -390,7 +392,7 @@
   # set SOCKS proxy
   socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, TorUtil.tor_host, TorUtil.tor_port)
   socket.socket = socks.socksocket
-  plog("INFO", "Set socks proxy to "+TorUtil.tor_host+":"+TorUtil.tor_port)
+  plog("INFO", "Set socks proxy to "+TorUtil.tor_host+":"+str(TorUtil.tor_port))
 
   while True:
     pct = start_pct