Author: sleon
Date: 2006-01-16 07:19:37 +0000 (Mon, 16 Jan 2006)
New Revision: 7866
Modified:
trunk/apps/freeviz/handler.py
trunk/apps/freeviz/server.py
Log:
added some handling of wrong data
Modified: trunk/apps/freeviz/handler.py
===================================================================
--- trunk/apps/freeviz/handler.py 2006-01-16 06:26:37 UTC (rev 7865)
+++ trunk/apps/freeviz/handler.py 2006-01-16 07:19:37 UTC (rev 7866)
@@ -28,8 +28,6 @@
db.insert(trans, nodeinfo,nodeinfo2,
backoff1=backoff1, backoff2=backoff2)
check_nodes(trans)
- #FINISHING TRANSACTION
- trans.commit()
#check if the node is up to date, if not remove it from node-pairs
def check_nodes(trans):
Modified: trunk/apps/freeviz/server.py
===================================================================
--- trunk/apps/freeviz/server.py 2006-01-16 06:26:37 UTC (rev 7865)
+++ trunk/apps/freeviz/server.py 2006-01-16 07:19:37 UTC (rev 7866)
@@ -24,13 +24,22 @@
trans = con.transaction()
while 1:
Base.vlock.acquire()
- print "Hanlding harvested data"
self.chunks = Base.chunks
Base.chunks = []
Base.vlock.release()
+ print "Hanlding harvested data(%d)" % len(self.chunks)
for chunk in self.chunks:
- handler.handle(chunk,trans)
- if self.chunks: print "COMMITED"
+ try:
+ handler.handle(chunk,trans)
+ except Exception:
+ print "ERROR IN %s" % chunk
+
+ if self.chunks:
+ trans.commit()
+ print "COMMITED (%d)" % len(self.chunks)
+ else:
+ print "NOTHING"
+
self.chunks=[]
time.sleep(HANDLER_DELAY)
@@ -54,9 +63,10 @@
Base.chunks.append(self.chunk)
Base.conns -= 1
Base.vlock.release()
- print "%s\n________\n" % self.chunk
+ #print "%s\n________\n" % self.chunk
+
lstn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
lstn.bind(('',PORT))
lstn.listen(MAXCONNS)
