4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop

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

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 77bc2782841a472f2694b030f5c544f812678114..e6038fcd7d7c7b38845dec0a8653b19f259eb3f5 100644 (file)
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -52,17 +52,18 @@ class PollClient(threading.Thread):
         if filters:
             self.filters = [filters]
         else:
-            self.filters = []
+            self.filters = [[]]
         self.on_event = on_event
         self.poll_time = poll_time
         self.stop = threading.Event()
 
     def run(self):
-        items = self.api.logs().list(limit=1, order="id desc", filters=self.filters[0]).execute()['items']
-        if len(items) > 0:
-            self.id = items[0]["id"]
-        else:
-            self.id = 0
+        self.id = 0
+        for f in self.filters:
+            items = self.api.logs().list(limit=1, order="id desc", filters=f).execute()['items']
+            if items:
+                if items[0]['id'] > self.id:
+                    self.id = items[0]['id']
 
         self.on_event({'status': 200})