Merge branch '5016-ctrl-c-arv-ws' closes #5016

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index d1abc0f7de0cd1a7c35cffb254605be302e85fd1..f65486a7f1775e7cedb2bc3e40b2b5d7e9095c9e 100644 (file)
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -79,7 +79,9 @@ class PollClient(threading.Thread):
             self.stop.wait(self.poll_time)
 
     def run_forever(self):
-        self.stop.wait()
+        # Have to poll here, otherwise KeyboardInterrupt will never get processed.
+        while not self.stop.is_set():
+            self.stop.wait(1)
 
     def close(self):
         self.stop.set()