Author: sleon
Date: 2006-01-07 22:05:45 +0000 (Sat, 07 Jan 2006)
New Revision: 7808
Modified:
trunk/apps/freeviz/db.py
trunk/apps/freeviz/gen.py
trunk/apps/freeviz/histdata.py
trunk/apps/freeviz/histogram.py
Log:
now nodes withing lastgoodverion are counted in histogram
Modified: trunk/apps/freeviz/db.py
===================================================================
--- trunk/apps/freeviz/db.py 2006-01-07 21:44:03 UTC (rev 7807)
+++ trunk/apps/freeviz/db.py 2006-01-07 22:05:45 UTC (rev 7808)
@@ -5,7 +5,7 @@
#mport pydot
-uri = 'mysql://twisted:severe at 127.0.0.1/twisted?cache=False'
+uri = 'mysql://twisted:severe at 127.0.0.1/twisted?debug=True'
con = connectionForURI(uri)
sqlhub.processConnection = con
@@ -24,6 +24,7 @@
lastUpdate = DateTimeCol(notNull=True, default=datetime.datetime.now())
name = StringCol(length=50, notNull=True, default='dummy')
version = StringCol(length=50, notNull=True, default='0')
+ lastGoodVersion = StringCol(length=50, notNull=True, default='0')
location = StringCol(length=50, notNull=True,default='0')
testnet = StringCol(length=10, notNull=True, default='true')
@@ -36,8 +37,8 @@
index = DatabaseIndex('identity',unique=True)
#index2 = DatabaseIndex('name',unique=True)
-def getLastVer():
- return con.queryOne('SELECT MAX(version) from node')[0]
+def getLastGoodVer():
+ return con.queryOne('SELECT MAX(last_good_version) from node')[0]
def init():
Node.createTable()
Modified: trunk/apps/freeviz/gen.py
===================================================================
--- trunk/apps/freeviz/gen.py 2006-01-07 21:44:03 UTC (rev 7807)
+++ trunk/apps/freeviz/gen.py 2006-01-07 22:05:45 UTC (rev 7808)
@@ -112,7 +112,7 @@
print "got empty nstate list"
g=pydot.Dot(type='digraph', labelloc='tl', label='Nodes: %s,
Edges: %s' % (nnum, enum) )
- lastver = self.regver.match( db.getLastVer()).group(1)
+ lastgoodver = db.getLastGoodVer()
#counts edges for a node
edge_count={}
@@ -122,14 +122,9 @@
nodecolor=self.nodeOK
transinfosize=self.defaultSize
- matc = self.regver.match(node.version)
- if matc:
- nversion = matc.group(1)
- else:
- nversion = '0'
-
-
- if nversion < lastver:
+
+ nversion = self.regver.match(node.version).group(1)
+ if node.lastGoodVersion < lastgoodver:
nodecolor=self.nodeOUTDATED
if node.requests != '0' or node.inserts != '0' or
node.transferring_requests != '0':
@@ -223,4 +218,4 @@
generator.gentopology()
histogram.gen()
oldnstate = generator.oldnstate
-#time.sleep(60)
+#time.sleep(10)
Modified: trunk/apps/freeviz/histdata.py
===================================================================
--- trunk/apps/freeviz/histdata.py 2006-01-07 21:44:03 UTC (rev 7807)
+++ trunk/apps/freeviz/histdata.py 2006-01-07 22:05:45 UTC (rev 7808)
@@ -8,11 +8,11 @@
nodes = list(handler.get_activenodes())
- lastver = db.getLastVer()
+ lastgoodver = db.getLastGoodVer()
goodnodes=[]
for node in nodes:
- if node.version >= lastver:
+ if node.lastGoodVersion >= lastgoodver:
goodnodes.append(node.id)
else:
print("%s is bad!" % node.name)
Modified: trunk/apps/freeviz/histogram.py
===================================================================
--- trunk/apps/freeviz/histogram.py 2006-01-07 21:44:03 UTC (rev 7807)
+++ trunk/apps/freeviz/histogram.py 2006-01-07 22:05:45 UTC (rev 7808)
@@ -19,6 +19,8 @@
for x in range(0,precision):
histogram.append(0)
number_of_connections=len(links)
+ if number_of_connections == 0:
+ return
#print "They are "+str(number_of_connections)+" connections."
