[or-cvs] r19512: {torctl} Woops, the attempts should include the failures too. (torctl/trunk/python/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-05-14 04:45:46 -0400 (Thu, 14 May 2009)
New Revision: 19512

Modified:
   torctl/trunk/python/TorCtl/SQLSupport.py
Log:

Woops, the attempts should include the failures too.



Modified: torctl/trunk/python/TorCtl/SQLSupport.py
===================================================================
--- torctl/trunk/python/TorCtl/SQLSupport.py	2009-05-14 07:03:22 UTC (rev 19511)
+++ torctl/trunk/python/TorCtl/SQLSupport.py	2009-05-14 08:45:46 UTC (rev 19512)
@@ -284,12 +284,10 @@
     # http://www.sqlalchemy.org/docs/04/sqlexpression.html#sql_update
     to_s = select([func.count(Extension.id)], 
         and_(stats_clause, Extension.table.c.to_node_idhex
-             == RouterStats.table.c.router_idhex,
-             Extension.table.c.row_type=='extension')).as_scalar()
+             == RouterStats.table.c.router_idhex)).as_scalar()
     from_s = select([func.count(Extension.id)], 
         and_(stats_clause, Extension.table.c.from_node_idhex
-             == RouterStats.table.c.router_idhex,
-             Extension.table.c.row_type=='extension')).as_scalar()
+             == RouterStats.table.c.router_idhex)).as_scalar()
     f_to_s = select([func.count(FailedExtension.id)], 
         and_(stats_clause, FailedExtension.table.c.to_node_idhex
              == RouterStats.table.c.router_idhex,