[ARVADOS] updated: 675118822f0a9968672dd99320d9b3494bc2b148
git at public.curoverse.com
git at public.curoverse.com
Wed May 14 16:16:29 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/event_log.js | 43 +
.../app/assets/stylesheets/keep_disks.css.scss | 2 +-
.../pipeline_instances/_show_event_log.html.erb | 21 +-
.../views/pipeline_instances/_show_recent.html.erb | 8 +-
sdk/cli/arvados-cli.gemspec | 1 +
sdk/cli/bin/arv-run-pipeline-instance | 46 +-
sdk/cli/bin/crunch-job | 12 +-
sdk/perl/lib/Arvados.pm | 2 +-
sdk/perl/lib/Arvados/Request.pm | 9 +-
sdk/ruby/arvados.gemspec | 1 +
sdk/ruby/lib/arvados.rb | 7 +-
services/api/Gemfile.lock | 10 +-
services/api/script/crunch-dispatch.rb | 20 +-
services/datamanager/experimental/datamanager.py | 887 +++++++++++++++++++++
.../datamanager/experimental/datamanager_test.py | 41 +
services/keep/src/keep/handler_test.go | 438 ++++++++++
services/keep/src/keep/keep.go | 274 ++++++-
services/keep/src/keep/keep_test.go | 5 +-
services/keep/src/keep/perms.go | 11 +-
19 files changed, 1728 insertions(+), 110 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/event_log.js
create mode 100755 services/datamanager/experimental/datamanager.py
create mode 100755 services/datamanager/experimental/datamanager_test.py
create mode 100644 services/keep/src/keep/handler_test.go
via 675118822f0a9968672dd99320d9b3494bc2b148 (commit)
via 243a6df519ee539ad9e5476cd6fcb51e4b0a48fe (commit)
via 7ca81caa537132acf4be86811e300b8a6ed3baac (commit)
via b1c303302dbac2ea6e9ab6775aecaf661b5da9c8 (commit)
via b093bbdccf67d895337e47bf32b0ab6f22bea632 (commit)
via f71c9e59bfff91da4b89050ceae27dbe3edcdb6c (commit)
via b91db14a4dced9d6ea124e86be3c796e6f2c8e8c (commit)
via a6c79a723f05e11c3b40d459e902eeca894c27b8 (commit)
via ff60e33ff3d9ad8144b9c269d12d1e5f18455416 (commit)
via e5f3ce60249a14f4fafdd9e0f31be45d1886a888 (commit)
via e6e94ca43f788b28d61c03f81b15ab5647f22d4c (commit)
via acef63e2e3e629da8b6825f33e6de7bf6bcc4fc2 (commit)
via b08f16445f02a02ea9246094657e93b354999b38 (commit)
via 3e6368d077fa4831f93255e271a18842788183fb (commit)
via f54395a1b98c4146a795ce7b18e04c23630ab631 (commit)
via 4742810338ec15a0654d18532f97f5ae41d48c5a (commit)
via 67f17818338153fc6f7b0c65f51e97bbb16f0cc7 (commit)
via d0b6bb76a0a7478794faebd3e1e5ab94b717596d (commit)
via 82393afcb6101fe6f601f6a752589d10b0909f8f (commit)
via 8ef62a19514b4cc0dd886b01902016f19be09ccf (commit)
via eef1936a73c7c85ba530cca028230241f5171333 (commit)
via 1a844d06238368c9d5c946a34c0c52485de1c435 (commit)
via 04ec74cf7dedfbb0becea0e0cb5018ccf55a31eb (commit)
via 087773f25a3df2d35e402f1afc6c7204a0852727 (commit)
via 2a3f67fa270b9660d4dc17b55c48fa781bdba4bb (commit)
via d5c8f2dc3faf77da783c2016630808f6351a4d6f (commit)
via 1a4846b2e916d3cf3958cf77117d710f72fa61cf (commit)
via 297f48f2e6233da1e61cda57af30c9c6b64f0908 (commit)
via b63b4b51a7bdaa38960e0b4428141c16c0a07d7a (commit)
via 2b8857f631f58df2baa93077185fb7a5a29c6aad (commit)
via bdc9139d17c184a58e5088270f2ce6ba361fb8a7 (commit)
via 7c8bfeb8d19db4f27b5fb5fd78e0afa3b7d07a89 (commit)
via f1b5f32b00d481e06d600cd6009d0995ecd19699 (commit)
via e419f135d46050250fdeb10b6e2a2a254caa85d4 (commit)
via aade22d7587e9f5921edb18ad76792a60eaa92fb (commit)
via 2e9a14d193db2948e14804539494f3b2384a87b8 (commit)
via ba4fcbd29b2615d9cc64010d756de49eac5109a5 (commit)
via a0a7b1a0c6f43a80449a76c00fb0c30858d38233 (commit)
via bfb190a4c3f5bd995ccae37536c3234b14eaf3ed (commit)
via 389f092ce9dc3a08245530fcf70d535783e62813 (commit)
via de9903cfc08ea7c3da459e7c4ee5a744d52a7c89 (commit)
via d034adbaf26a19e8fd48124cadd5108d2d3de642 (commit)
via a3650fa043500139ac36587a4b61ffed1a2dc1a3 (commit)
via f7538ca2df4a43ff60f87675f52a59edacfcdc7e (commit)
via f4925bb0e7d9de484579b71087f181b9dbea5bff (commit)
via ab66542f7c9c2dd4909e1bf3d03ef5df5f95a6f9 (commit)
via ec4e2b3707c030dab6081db499adc5ac369e61bd (commit)
via b189f5ed7a6fd3585535b9d9d3d587115cf383e7 (commit)
via 2fce84531f36daa2323276f0c6b147efe82852ec (commit)
via 5254bebf574f0f72bb0321e944d089ad6f6c25e2 (commit)
via 42c9be2a3187291502efcebefc09ce603fd31106 (commit)
via b586267c7ff0a5973ecf2f83b3fa5eb452669cfc (commit)
via 4efaeba6eb371d03aa8c8f052b63c2b3404de063 (commit)
via f76947a7c1ba973a11e563b0977d54a2ece2ce38 (commit)
via e3ce426fda2e7d2283d7092f988245c6900c8949 (commit)
via cd2672dc235efaacd533aadeef489994fe684a25 (commit)
via 40cc2b01c2a3ff911549c2d31c8195905109633d (commit)
via 74236320d68bf092f7f76f7ccf4f7a974735c6ab (commit)
via d0bf7a1ff103285e54433d3bcb67c2138b534542 (commit)
via bb6f6fb4021045b86ef58b3a975cf60b58807fa2 (commit)
via 264c7fdb6c651ef73cfe4f0a280bf6672846eada (commit)
via 1ea7294edb4aa80f13d805ef29875a39caab471c (commit)
from 5c2372f1e53184a60d9e1366d26ce41bf405a0a9 (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 675118822f0a9968672dd99320d9b3494bc2b148
Merge: 243a6df 7ca81ca
Author: radhika <radhika at curoverse.com>
Date: Wed May 14 16:16:09 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
commit 243a6df519ee539ad9e5476cd6fcb51e4b0a48fe
Author: radhika <radhika at curoverse.com>
Date: Wed May 14 16:14:59 2014 -0400
2756: Use event_log.js javascript asset to subscribe to websockets
diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
new file mode 100644
index 0000000..f356b6a
--- /dev/null
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -0,0 +1,43 @@
+/*
+ * This file establishes a websockets connection with the API Server.
+ *
+ * The subscribe method takes a window element id and object id. Any log
+ * events for that particular object id are added to that window element.
+ */
+
+var event_log_disp;
+
+function subscribeToEventLog (url, uuid, elementId) {
+ // create the event log dispatcher
+ event_log_disp = new WebSocket(url);
+
+ event_log_disp.onopen = function(event) { onEventLogDispatcherOpen(event) };
+ event_log_disp.onmessage = function(event) { onEventLogDispatcherMessage(event) };
+
+ // Add the elementId to listener map
+ event_log_listener_map = JSON.parse(sessionStorage.getItem("event_log_listener_map"));
+ if (event_log_listener_map == null)
+ event_log_listener_map = {};
+ delete event_log_listener_map[elementId];
+ event_log_listener_map[elementId] = uuid;
+
+ sessionStorage.removeItem("event_log_listener_map");
+ sessionStorage.setItem("event_log_listener_map", JSON.stringify(event_log_listener_map));
+}
+
+function onEventLogDispatcherOpen(event) {
+ event_log_disp.send('{"method":"subscribe"}');
+}
+
+function onEventLogDispatcherMessage(event) {
+ event_log_listener_map = JSON.parse(sessionStorage.getItem("event_log_listener_map"));
+
+ for (var key in event_log_listener_map) {
+ value = event_log_listener_map[key];
+
+ eventData = JSON.parse(event.data);
+ if (value === eventData.object_uuid) {
+ $('#'+key).append(eventData.summary + "
");
+ }
+ }
+}
diff --git a/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb b/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
index 74806a5..f4061f0 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
@@ -1,24 +1,5 @@
<span>
<h3>Log for pipeline</h3>
- <img hidden=true id="pipeline_event_log_img" src="/favicon.ico" onload="subscribeToEventLogs()";></image>
+ <image hidden=true id="pipeline_event_log_img" src="/favicon.ico" onclick="sendToDispatcher();" onload="subscribeToEventLog('<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>', '<%=@object.uuid%>', 'pipeline_event_log_area')";></image>
<textarea row="10" cols="80" id="pipeline_event_log_area"></textarea>
</span>
-
-<script>
- $(function() {
- displayEventLog = function (content) {
- $("#pipeline_event_log_area").append(content + "<br>");
- };
-
- var dispatcher = new WebSocket('<%= $arvados_api_client.discovery[:websocketUrl] %>?api_token=<%= Thread.current[:arvados_api_token] %>');
- dispatcher.onmessage = function(event) {
- //displayEventLog(JSON.parse(event.data));
- displayEventLog(event.data);
- };
-
- subscribeToEventLogs = function () {
- alert ("got it");
- dispatcher.send('{"method":"subscribe"}');
- };
- });
-</script>
commit b1c303302dbac2ea6e9ab6775aecaf661b5da9c8
Merge: 5c2372f b093bbd
Author: radhika <radhika at curoverse.com>
Date: Wed May 14 14:34:18 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list