You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2009/04/18 20:09:38 UTC

svn commit: r766369 - in /qpid/trunk/qpid/python/qpid: queue.py util.py

Author: rhs
Date: Sat Apr 18 18:09:38 2009
New Revision: 766369

URL: http://svn.apache.org/viewvc?rev=766369&view=rev
Log:
used timed wait to improve debugability

Modified:
    qpid/trunk/qpid/python/qpid/queue.py
    qpid/trunk/qpid/python/qpid/util.py

Modified: qpid/trunk/qpid/python/qpid/queue.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/queue.py?rev=766369&r1=766368&r2=766369&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/queue.py (original)
+++ qpid/trunk/qpid/python/qpid/queue.py Sat Apr 18 18:09:38 2009
@@ -63,7 +63,9 @@
     if listener is None:
       if self.thread is not None:
         self.put(Queue.STOP)
-        self.thread.join()
+        # loop and timed join permit keyboard interrupts to work
+        while self.thread.isAlive():
+          self.thread.join(3)
         self.thread = None
 
     self.listener = listener

Modified: qpid/trunk/qpid/python/qpid/util.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/util.py?rev=766369&r1=766368&r2=766369&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/util.py (original)
+++ qpid/trunk/qpid/python/qpid/util.py Sat Apr 18 18:09:38 2009
@@ -50,7 +50,9 @@
     start = time.time()
     while not predicate():
       if timeout is None:
-        condition.wait()
+        # using the timed wait prevents keyboard interrupts from being
+        # blocked while waiting
+        condition.wait(3)
       elif passed < timeout:
         condition.wait(timeout - passed)
       else:



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org