purge old collections

Author: koivunen

geovis.py

@@ -38,6 +38,7 @@ def populateNames(remoteip,res):
 	return res
 
 def iterateViableConnections():
+	now=time.time()
 	for id,conn in connections.getConnections().items():
 
 		#TODO: keep gone for a while (if space)
@@ -47,6 +48,8 @@ def iterateViableConnections():
 			continue
 
 		lastEventTime = conn.get("gone") or conn.get("lastActivity")
+		if now-lastEventTime>60*5:
+			continue
 
 		homeip = connections.getHomeIPFromConnection(conn)
 		remoteip = conn.get("dst")

sanvis.py

@@ -60,13 +60,18 @@ def addLink(s,name,hitcount,actualtargets,v=1,last_act=0):
 	link_count=0
 	candidates={}
 	name_hits={}
+
+	now=time.time()
 	for id,conn in connections.getConnections().items():
 
 		#TODO: keep gone for a while (if space)
 		if conn.get("gone"):
 			continue
 		if conn.get("state") and conn["state"]!="ESTABLISHED":
 			continue
+		lastEventTime = conn.get("gone") or conn.get("lastActivity")
+		if now-lastEventTime>60*5:
+			continue
 
 		#TODO: packetIn gets swapped also if this istrue
 		homeip = connections.getHomeIPFromConnection(conn)
@@ -178,7 +183,7 @@ def addLink(s,name,hitcount,actualtargets,v=1,last_act=0):
 				if namePopularity[name]>1:
 					final_count+=1
 
-	# OOPS: If we try finding common links and there none then show at least something (TODO: sort by target freshness)
+	# OOPS: If we try finding common links and there none then show at least something (TODO: sort by target freshness and only show 25 targets instead of reducing to only common targets)
 	if final_count<1:
 		ONLY_COMMON_LINKS=False
 		final_count=link_count