From fe21e5236f596001d22e4b28519d1c5ef32a7e3c Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 15 Oct 2014 17:12:59 -0400
Subject: [PATCH] 3609: PollClient waits on event object instead of time.sleep,
 fix filters.  Also fix --poll-interval and --no-poll

---
 sdk/python/arvados/commands/ws.py | 11 +++++++----
 sdk/python/arvados/events.py      | 30 +++++++++++++++++-------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/sdk/python/arvados/commands/ws.py b/sdk/python/arvados/commands/ws.py
index c27503cc1f..142a205d34 100644
--- a/sdk/python/arvados/commands/ws.py
+++ b/sdk/python/arvados/commands/ws.py
@@ -5,6 +5,7 @@ import logging
 import argparse
 import arvados
 import json
+import time
 from arvados.events import subscribe
 
 def main(arguments=None):
@@ -15,8 +16,8 @@ def main(arguments=None):
     parser.add_argument('-f', '--filters', type=str, default="", help="Arvados query filter to apply to log events (JSON encoded)")
 
     group = parser.add_argument_group('Polling fallback')
-    group.add_argument('--poll-interval', default=15, help="If websockets is not available, specify the polling interval, default is every 15 seconds")
-    group.add_argument('--no-poll', action='store_false', dest='poll_fallback', help="Do not poll if websockets are not available, just fail")
+    group.add_argument('--poll-interval', default=15, type=int, help="If websockets is not available, specify the polling interval, default is every 15 seconds")
+    group.add_argument('--no-poll', action='store_false', dest='poll_interval', help="Do not poll if websockets are not available, just fail")
 
     group = parser.add_argument_group('Jobs and Pipelines')
     group.add_argument('-p', '--pipeline', type=str, default="", help="Supply pipeline uuid, print log output from pipeline and its jobs")
@@ -69,8 +70,10 @@ def main(arguments=None):
             print json.dumps(ev)
 
     try:
-        ws = subscribe(api, filters, on_message, poll_fallback=args.poll_fallback)
-        ws.run_forever()
+        ws = subscribe(api, filters, on_message, poll_fallback=args.poll_interval)
+        if ws:
+            while True:
+                time.sleep(60)
     except KeyboardInterrupt:
         pass
     except Exception:
diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 489be5a0ee..df64b4e241 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -48,32 +48,36 @@ class PollClient(threading.Thread):
     def __init__(self, api, filters, on_event, poll_time):
         super(PollClient, self).__init__()
         self.api = api
-        self.filters = filters
+        self.filters = [filters]
         self.on_event = on_event
-        items = self.api.logs().list(limit=1, order=["id desc"], filters=filters).execute()['items']
+        items = self.api.logs().list(limit=1, order="id desc", filters=filters).execute()['items']
         if len(items) > 0:
             self.id = items[0]["id"]
         else:
             self.id = 0
         self.poll_time = poll_time
-        self.loop = True
+        self.stop = threading.Event()
         self.on_event({'status': 200})
 
     def run(self):
-        while self.loop:
-            time.sleep(self.poll_time)
-            items = self.api.logs().list(order=["id asc"], filters=self.filters+[["id", ">", str(self.id)]]).execute()['items']
-            for i in items:
-                self.id = i['id']
-                self.on_event(i)
+        while not self.stop.isSet():
+            max_id = 0
+            for f in self.filters:
+                items = self.api.logs().list(order="id asc", filters=f+[["id", ">", str(self.id)]]).execute()['items']
+                for i in items:
+                    if i['id'] > max_id:
+                        max_id = i['id']
+                    self.on_event(i)
+            self.id = max_id
+            self.stop.wait(self.poll_time)
 
     def close(self):
-        self.loop = False
+        self.stop.set()
         self.join()
 
     def subscribe(self, filters):
         self.on_event({'status': 200})
-        self.filters += filters
+        self.filters.append(filters)
 
     def unsubscribe(self, filters):
         del self.filters[self.filters.index(filters)]
@@ -87,9 +91,9 @@ def subscribe(api, filters, on_event, poll_fallback=15):
             ws.connect()
             return ws
         except Exception as e:
-            _logger.warn("Got exception %s trying to connect to web sockets" % e)
+            _logger.warn("Got exception %s trying to connect to web sockets at %s" % (e, api._rootDesc['websocketUrl']))
             if ws:
-                ws.close()
+                ws.close_connection()
     if poll_fallback:
         _logger.warn("Web sockets not available, falling back to log table polling")
         p = PollClient(api, filters, on_event, poll_fallback)
-- 
2.30.2