Author: sleon
Date: 2006-01-07 05:04:51 +0000 (Sat, 07 Jan 2006)
New Revision: 7792
Modified:
trunk/apps/freeviz/gen.py
trunk/apps/freeviz/handler.py
Log:
added code for detecting non active(dead) nodes,and not showing them
Modified: trunk/apps/freeviz/gen.py
===================================================================
--- trunk/apps/freeviz/gen.py 2006-01-07 04:48:49 UTC (rev 7791)
+++ trunk/apps/freeviz/gen.py 2006-01-07 05:04:51 UTC (rev 7792)
@@ -4,6 +4,7 @@
import pydot
import sys
import re
+import handler
sys.path+=['/home/sleon/public_html/bla/']
from db import *
@@ -21,7 +22,7 @@
def gentopology():
#NodePair.createTable( ifNotExists=True )
node_pairs = list(NodePair.select())
- nodes = list(Node.select())
+ nodes = handler.get_activenodes()
g=pydot.Dot(type='digraph')
lastver = regver.match( getLastVer()).group(1)
Modified: trunk/apps/freeviz/handler.py
===================================================================
--- trunk/apps/freeviz/handler.py 2006-01-07 04:48:49 UTC (rev 7791)
+++ trunk/apps/freeviz/handler.py 2006-01-07 05:04:51 UTC (rev 7792)
@@ -36,11 +36,26 @@
nodes = db.Node.select()
for node in nodes:
- nodetime = node.lastUpdate
- if (curtime() - convtime(nodetime) ) > timedelta:
+ if inactive(node):
nodeinfo = getInfoFromNode(node)
db.delete_conns(nodeinfo)
+
+def inactive(node):
+ nodetime = node.lastUpdate
+ return (curtime() - convtime(nodetime) ) > timedelta
+
+
+def get_activenodes():
+ nodes = db.Node.select()
+ active_nodes=[]
+
+ for node in nodes:
+ if not inactive(node):
+ active_nodes.append(node)
+
+ return active_nodes
+
#time in seconds since epoch
def curtime():
return time.time()
