projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 11453-federated-tokens
[arvados.git]
/
sdk
/
python
/
arvados
/
events.py
diff --git
a/sdk/python/arvados/events.py
b/sdk/python/arvados/events.py
index b385761f7b7b1575dc576e783b3ae61e45eeb2cf..c308750f430c352327f53b13d5d46329b0ee28ed 100644
(file)
--- a/
sdk/python/arvados/events.py
+++ b/
sdk/python/arvados/events.py
@@
-1,4
+1,12
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
from __future__ import absolute_import
from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str
+from builtins import object
import arvados
from . import config
from . import errors
import arvados
from . import config
from . import errors
@@
-6,7
+14,7
@@
from .retry import RetryLoop
import logging
import json
import logging
import json
-import thread
+import
_
thread
import threading
import time
import os
import threading
import time
import os
@@
-116,22
+124,22
@@
class EventClient(object):
self.on_event_cb(m)
except Exception as e:
_logger.exception("Unexpected exception from event callback.")
self.on_event_cb(m)
except Exception as e:
_logger.exception("Unexpected exception from event callback.")
- thread.interrupt_main()
+
_
thread.interrupt_main()
def on_closed(self):
if not self.is_closed.is_set():
def on_closed(self):
if not self.is_closed.is_set():
- _logger.warn("Unexpected close. Reconnecting.")
+ _logger.warn
ing
("Unexpected close. Reconnecting.")
for tries_left in RetryLoop(num_retries=25, backoff_start=.1, max_wait=15):
try:
self._setup_event_client()
for tries_left in RetryLoop(num_retries=25, backoff_start=.1, max_wait=15):
try:
self._setup_event_client()
- _logger.warn("Reconnect successful.")
+ _logger.warn
ing
("Reconnect successful.")
break
except Exception as e:
break
except Exception as e:
- _logger.warn("Error '%s' during websocket reconnect.", e)
+ _logger.warn
ing
("Error '%s' during websocket reconnect.", e)
if tries_left == 0:
_logger.exception("EventClient thread could not contact websocket server.")
self.is_closed.set()
if tries_left == 0:
_logger.exception("EventClient thread could not contact websocket server.")
self.is_closed.set()
- thread.interrupt_main()
+
_
thread.interrupt_main()
return
def run_forever(self):
return
def run_forever(self):
@@
-226,7
+234,7
@@
class PollClient(threading.Thread):
_logger.exception("PollClient thread could not contact API server.")
with self._closing_lock:
self._closing.set()
_logger.exception("PollClient thread could not contact API server.")
with self._closing_lock:
self._closing.set()
- thread.interrupt_main()
+
_
thread.interrupt_main()
return
for i in items["items"]:
skip_old_events = [["id", ">", str(i["id"])]]
return
for i in items["items"]:
skip_old_events = [["id", ">", str(i["id"])]]
@@
-237,7
+245,7
@@
class PollClient(threading.Thread):
self.on_event(i)
except Exception as e:
_logger.exception("Unexpected exception from event callback.")
self.on_event(i)
except Exception as e:
_logger.exception("Unexpected exception from event callback.")
- thread.interrupt_main()
+
_
thread.interrupt_main()
if items["items_available"] > len(items["items"]):
moreitems = True
if not moreitems:
if items["items_available"] > len(items["items"]):
moreitems = True
if not moreitems:
@@
-289,7
+297,7
@@
def _subscribe_websocket(api, filters, on_event, last_log_id=None):
try:
client = EventClient(uri_with_token, filters, on_event, last_log_id)
except Exception:
try:
client = EventClient(uri_with_token, filters, on_event, last_log_id)
except Exception:
- _logger.warn("Failed to connect to websockets on %s" % endpoint)
+ _logger.warn
ing
("Failed to connect to websockets on %s" % endpoint)
raise
else:
return client
raise
else:
return client
@@
-318,7
+326,7
@@
def subscribe(api, filters, on_event, poll_fallback=15, last_log_id=None):
else:
_logger.info("Using polling because ARVADOS_DISABLE_WEBSOCKETS is true")
except Exception as e:
else:
_logger.info("Using polling because ARVADOS_DISABLE_WEBSOCKETS is true")
except Exception as e:
- _logger.warn("Falling back to polling after websocket error: %s" % e)
+ _logger.warn
ing
("Falling back to polling after websocket error: %s" % e)
p = PollClient(api, filters, on_event, poll_fallback, last_log_id)
p.start()
return p
p = PollClient(api, filters, on_event, poll_fallback, last_log_id)
p.start()
return p