[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Merge last patch to maintenance branch



Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv19615/lib/mixminion

Modified Files:
      Tag: mixminion-v0-0-6-patches
	ClientMain.py 
Log Message:
Merge last patch to maintenance branch

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.138.2.5
retrieving revision 1.138.2.6
diff -u -d -r1.138.2.5 -r1.138.2.6
--- ClientMain.py	21 Dec 2003 18:33:31 -0000	1.138.2.5
+++ ClientMain.py	21 Dec 2003 19:11:32 -0000	1.138.2.6
@@ -500,6 +500,12 @@
                     self.queue.removePacket(handles[idx])
                 elif hasattr(pktList[idx], 'remove'):
                     pktList[idx].remove()
+            if nGood:
+                try:
+                    self.queue.cleanQueue()
+                except:
+                    e2 = sys.exc_info()
+                    LOG.error("Error while cleaning queue: %s",e2[1])
 
             if nBad and warnIfLost:
                 LOG.error("Error with queueing disabled: %s/%s lost",