8281: Limit # write threads to #copies remaining, not #copies total.

[arvados.git] / sdk / python / arvados / events.py

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index df5b3e7dee514b8aea45edaa73bcd47042d8fab3..3132da3a0a2e271350c1a5418efa577703555231 100644 (file)
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -28,33 +28,24 @@ class EventClient(WebSocketClient):
         super(EventClient, self).__init__(url, ssl_options=ssl_options)
         self.filters = filters
         self.on_event = on_event
-        self.stop = threading.Event()
         self.last_log_id = last_log_id
+        self._closed_lock = threading.RLock()
+        self._closed = False
 
     def opened(self):
         self.subscribe(self.filters, self.last_log_id)
 
     def received_message(self, m):
-        self.on_event(json.loads(str(m)))
-
-    def closed(self, code, reason=None):
-        self.stop.set()
+        with self._closed_lock:
+            if not self._closed:
+                self.on_event(json.loads(str(m)))
 
     def close(self, code=1000, reason=''):
         """Close event client and wait for it to finish."""
-
-        # parent close() method sends a asynchronous "closed" event to the server
         super(EventClient, self).close(code, reason)
-
-        # if server doesn't respond by finishing the close handshake, we'll be
-        # stuck in limbo forever.  We don't need to wait for the server to
-        # respond to go ahead and actually close the socket.
-        self.close_connection()
-
-        # wait for websocket thread to finish up (closed() is called by
-        # websocket thread in as part of terminate())
-        while not self.stop.is_set():
-            self.stop.wait(1)
+        with self._closed_lock:
+            # make sure we don't process any more messages.
+            self._closed = True
 
     def subscribe(self, filters, last_log_id=None):
         m = {"method": "subscribe", "filters": filters}