- if 'websocketUrl' in api._rootDesc:
- url = "{}?api_token={}".format(api._rootDesc['websocketUrl'], config.get('ARVADOS_API_TOKEN'))
- ws = EventClient(url, filters, on_event)
- ws.connect()
- elif poll_fallback:
- _logger.warn("Web sockets not available, falling back to log table polling")
- ws = PollClient(api, filters, on_event, poll_fallback)
- else:
- _logger.error("Web sockets not available")
- return None
- return ws
- except Exception:
- if ws:
- ws.close_connection()
- if poll_fallback:
- return PollClient(api, filters, on_event, poll_fallback)
- else:
- _logger.error("Web sockets not available at %s" % api._rootDesc['websocketUrl'])
- raise
+ return _subscribe_websocket(api, filters, on_event)
+ except Exception as e:
+ _logger.warn("Falling back to polling after websocket error: %s" % e)
+ p = PollClient(api, filters, on_event, poll_fallback)
+ p.start()
+ return p