3782: Merge branch 'master' into 3782-stub-file-content

[arvados.git] / sdk / python / bin / arv-ws

diff --git a/sdk/python/bin/arv-ws b/sdk/python/bin/arv-ws
index 58b628145ff4fe0689fc85a9833c5b7cb093d751..ce7f066ec7682ff8b4fe3cdeaa59e0656db68716 100755 (executable)
--- a/sdk/python/bin/arv-ws
+++ b/sdk/python/bin/arv-ws
@@ -6,6 +6,8 @@ import argparse
 import arvados
 from arvados.events import subscribe
 
+logger = logging.getLogger('arvados.arv-ws')
+
 parser = argparse.ArgumentParser()
 parser.add_argument('-u', '--uuid', type=str, default="")
 args = parser.parse_args()
@@ -22,9 +24,7 @@ ws = None
 try:
   ws = subscribe(api, filters, lambda ev: on_message(ev))
   ws.run_forever()
-except KeyboardInterrupt:
-  print '' # don't log it
-except:
-  logging.exception('')
+except Exception:
+  logger.exception('')
   if (ws):
     ws.close_connection()