[ARVADOS] updated: 7c098f97052780882fe4c08f48f83b47a1973d36

[git at public.curoverse.com]

Summary of changes:
 .../controllers/pipeline_instances_controller.rb   | 111 +++++++++++----------
 .../app/views/application/_content.html.erb        |   4 +-
 sdk/cli/bin/crunch-job                             |  43 ++++++--
 sdk/python/arvados/commands/keepdocker.py          |   3 +-
 sdk/python/bin/arv-ws                              |  26 ++---
 services/api/app/models/arvados_model.rb           |  24 +++--
 services/api/app/models/collection.rb              |  45 +++++++++
 services/api/app/models/job.rb                     |  18 ++++
 .../20140611173003_add_docker_locator_to_jobs.rb   |   5 +
 services/api/db/schema.rb                          |   4 +-
 services/api/test/fixtures/collections.yml         |  11 ++
 services/api/test/fixtures/links.yml               |  95 +++++++++++++++++-
 services/api/test/integration/select_test.rb       |  14 ++-
 .../test/integration/serialized_encoding_test.rb   |   2 +-
 services/api/test/unit/job_test.rb                 | 108 +++++++++++++++++++-
 .../keep/src/arvados.org/keepproxy/keepproxy.go    |   6 +-
 16 files changed, 421 insertions(+), 98 deletions(-)
 create mode 100644 services/api/db/migrate/20140611173003_add_docker_locator_to_jobs.rb

       via  7c098f97052780882fe4c08f48f83b47a1973d36 (commit)
       via  8b7cac2607bda6ace3444ff20917c6262395bd7a (commit)
       via  c164cb15f8435817784a71c45fbd7e6c6690d3cd (commit)
       via  9878a4d9e0b535a13a323dfb8776866b542ece1a (commit)
       via  439e1417599cad4e65d506a11b583a6ebabc7604 (commit)
       via  035ad9ea52c05ce5bce347f26226602fd98d4eec (commit)
       via  f6572fcdead970fbf4eeace0e72ea7a9096591c7 (commit)
       via  ac2d25e6b90c6d9bbab7e620b57b11113a60b28f (commit)
       via  3176c5136e9500fb663db84ba6f0198fa81fec6b (commit)
       via  e88deba4b916f22abc14355b4b4640c8ccc4148a (commit)
      from  91cea2d82e477833d322b7267988c490ed284b62 (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 7c098f97052780882fe4c08f48f83b47a1973d36
Merge: 8b7cac2 c164cb1
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 17 11:45:06 2014 -0400

    Merge branch 'master' into 2896-websocket-cli


commit 8b7cac2607bda6ace3444ff20917c6262395bd7a
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 17 11:43:38 2014 -0400

    2896: incorporate review comments: add logging, enhance creating filter object.

diff --git a/sdk/python/bin/arv-ws b/sdk/python/bin/arv-ws
index 0721687..58b6281 100755
--- a/sdk/python/bin/arv-ws
+++ b/sdk/python/bin/arv-ws
@@ -1,34 +1,30 @@
 #!/usr/bin/env python
 
-import argparse
 import sys
+import logging
+import argparse
+import arvados
+from arvados.events import subscribe
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-u', '--uuid', type=str, default="")
 args = parser.parse_args()
 
-def on_message(ev):
-  print "\n", ev
-
 filters = []
-if len(args.uuid)>0:
-  filter1 = []
-  filter1.append ('object_uuid')
-  filter1.append ('=')
-  filter1.append (args.uuid)
-  filters.append (filter1)
-
-import arvados
-from arvados.events import subscribe
+if len(args.uuid)>0: filters = [ ['object_uuid', '=', args.uuid] ]
 
 api = arvados.api('v1', cache=False)
 
+def on_message(ev):
+  print "\n", ev
+
 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('')
   if (ws):
     ws.close_connection()
-  else:
-    sys.exc_info()

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


hooks/post-receive
--