X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fa645932e008bc03bd4906b4e4b795f22ed78fd3..535856c28a12bb07dc986b980b0f4ccfdfd25640:/sdk/cwl/arvados_cwl/task_queue.py

diff --git a/sdk/cwl/arvados_cwl/task_queue.py b/sdk/cwl/arvados_cwl/task_queue.py
index 7efb08aec2..b9fd09807b 100644
--- a/sdk/cwl/arvados_cwl/task_queue.py
+++ b/sdk/cwl/arvados_cwl/task_queue.py
@@ -31,7 +31,7 @@ class TaskQueue(object):
                 try:
                     task()
                 except Exception as e:
-                    logger.exception("Unexpected error running task")
+                    logger.exception("Unhandled exception running task")
                     self.error = e
 
                 with self.lock:
@@ -49,7 +49,7 @@ class TaskQueue(object):
         try:
             # Drain queue
             while not self.task_queue.empty():
-                self.task_queue.get()
+                self.task_queue.get(True, .1)
         except Queue.Empty:
             pass