Merge branch '3168-crunch-git-fetch' closes #3168

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

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 3df934a981e758da8973bf83ad3e8ecf79273b42..b7d610d66e729a9b9cb3a27b29a9abc51395493b 100644 (file)
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -6,6 +6,9 @@ import time
 import ssl
 import re
 import config
+import logging
+
+_logger = logging.getLogger('arvados.events')
 
 class EventClient(WebSocketClient):
     def __init__(self, url, filters, on_event):
@@ -34,10 +37,13 @@ class EventClient(WebSocketClient):
             pass
 
 def subscribe(api, filters, on_event):
+    ws = None
     try:
         url = "{}?api_token={}".format(api._rootDesc['websocketUrl'], config.get('ARVADOS_API_TOKEN'))
         ws = EventClient(url, filters, on_event)
         ws.connect()
         return ws
-    except:
-        ws.close_connection()
+    except Exception:
+        if (ws):
+          ws.close_connection()
+        raise