[ARVADOS] updated: 5185d344b45f34ced54cb15310acdb5a92103a74

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/events.py                |  7 ++++++-
 services/api/config/application.default.yml | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

       via  5185d344b45f34ced54cb15310acdb5a92103a74 (commit)
       via  4f8f78732e08abb8b83166fd7ffbf207e9466264 (commit)
       via  3b72eb3537eaaf360fdc85d6029c38935bbba5fc (commit)
       via  ae8829d306b3fc459e2d5f2cae4cef2e69c60eb7 (commit)
      from  7c098f97052780882fe4c08f48f83b47a1973d36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5185d344b45f34ced54cb15310acdb5a92103a74
Merge: 4f8f787 3b72eb3
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 17 13:58:48 2014 -0400

    Merge branch 'master' into 2896-websocket-cli


commit 4f8f78732e08abb8b83166fd7ffbf207e9466264
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 17 13:58:12 2014 -0400

    2896: add logging to events.py

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 3df934a..06f3b34 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -6,6 +6,7 @@ import time
 import ssl
 import re
 import config
+import logging
 
 class EventClient(WebSocketClient):
     def __init__(self, url, filters, on_event):
@@ -34,10 +35,14 @@ 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()
+        logging.exception('')
+        if (ws):
+          ws.close_connection()        
+        raise

-----------------------------------------------------------------------


hooks/post-receive
--