[or-cvs] r19202: {torflow} Kill a couple WARNs and make the control log unbuffered. (torflow/trunk/CircuitAnalysis/BuildTimes)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-31 07:38:16 -0400 (Tue, 31 Mar 2009)
New Revision: 19202

Modified:
   torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py
   torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py
Log:

Kill a couple WARNs and make the control log unbuffered.



Modified: torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py	2009-03-31 11:36:50 UTC (rev 19201)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py	2009-03-31 11:38:16 UTC (rev 19202)
@@ -134,7 +134,7 @@
   s.connect((control_host,control_port))
   c = PathSupport.Connection(s)
   c.authenticate(control_pass)  # also launches thread...
-  c.debug(file(filename+".log", "w"))
+  c.debug(file(filename+".log", "w", buffering=0))
   h = CircStatsGatherer(c,__selmgr,filename,ncircuits)
   c.set_event_handler(h)
   global FUDValue

Modified: torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py	2009-03-31 11:36:50 UTC (rev 19201)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py	2009-03-31 11:38:16 UTC (rev 19202)
@@ -178,10 +178,10 @@
     elif disk_only:
         continue  
 
-    if ranks and not router.rank_history:
+    if len(ranks) > 1 and not router.rank_history:
       print "WARN: Rank storage mismatch for "+router.idhex
       continue
-    if bws and not router.bw_history:
+    if len(bws) > 1 and not router.bw_history:
       print "WARN: Bw storage mismatch for "+router.idhex
       continue