[ARVADOS] updated: ea17ec3d053bd2f792730c5ea74d03109ef942ce
git at public.curoverse.com
git at public.curoverse.com
Wed May 21 18:54:12 EDT 2014
Summary of changes:
.../app/assets/javascripts/pipeline_instances.js | 2 +-
.../app/controllers/application_controller.rb | 21 +-
.../app/controllers/collections_controller.rb | 48 ++---
.../app/controllers/keep_services_controller.rb | 2 +
.../app/helpers/pipeline_instances_helper.rb | 11 ++
.../app/models/{keep_disk.rb => keep_service.rb} | 2 +-
.../app/views/collections/_show_files.html.erb | 2 +-
.../app/views/collections/show_file_links.html.erb | 82 ++++++++
.../app/views/layouts/application.html.erb | 8 +-
.../pipeline_instances/_show_components.html.erb | 4 +
apps/workbench/config/routes.rb | 4 +
apps/workbench/public/robots.txt | 2 -
.../test/functional/collections_controller_test.rb | 34 +---
.../workbench/test/integration/collections_test.rb | 27 ++-
apps/workbench/test/integration_helper.rb | 5 +
apps/workbench/test/test_helper.rb | 1 +
doc/_config.yml | 2 +
doc/api/methods/keep_services.html.textile.liquid | 75 +++++++
doc/api/schema/KeepDisk.html.textile.liquid | 4 +-
doc/api/schema/KeepService.html.textile.liquid | 24 +++
sdk/python/run_test_server.py | 9 +-
.../arvados/v1/collections_controller.rb | 62 +++++-
.../arvados/v1/keep_services_controller.rb | 21 ++
.../api/app/models/api_client_authorization.rb | 2 +-
services/api/app/models/keep_disk.rb | 18 +-
services/api/app/models/keep_service.rb | 15 ++
services/api/app/models/locator.rb | 84 ++++++++
services/api/config/application.default.yml | 5 +
services/api/config/application.yml.example | 13 ++
services/api/config/routes.rb | 3 +
.../migrate/20140519205916_create_keep_services.rb | 51 +++++
services/api/db/schema.rb | 23 ++-
.../test/fixtures/api_client_authorizations.yml | 7 +
services/api/test/fixtures/keep_disks.yml | 12 +-
services/api/test/fixtures/keep_services.yml | 23 +++
services/api/test/fixtures/links.yml | 14 ++
.../arvados/v1/collections_controller_test.rb | 216 +++++++++++++++++++++
.../arvados/v1/keep_disks_controller_test.rb | 34 +---
.../arvados/v1/keep_services_controller_test.rb | 23 +++
services/api/test/integration/keep_proxy_test.rb | 25 +++
.../api/test/unit/keep_service_test.rb | 2 +-
41 files changed, 889 insertions(+), 133 deletions(-)
create mode 100644 apps/workbench/app/controllers/keep_services_controller.rb
copy apps/workbench/app/models/{keep_disk.rb => keep_service.rb} (70%)
create mode 100644 apps/workbench/app/views/collections/show_file_links.html.erb
create mode 100644 doc/api/methods/keep_services.html.textile.liquid
create mode 100644 doc/api/schema/KeepService.html.textile.liquid
create mode 100644 services/api/app/controllers/arvados/v1/keep_services_controller.rb
create mode 100644 services/api/app/models/keep_service.rb
create mode 100644 services/api/app/models/locator.rb
create mode 100644 services/api/db/migrate/20140519205916_create_keep_services.rb
create mode 100644 services/api/test/fixtures/keep_services.yml
create mode 100644 services/api/test/functional/arvados/v1/keep_services_controller_test.rb
create mode 100644 services/api/test/integration/keep_proxy_test.rb
copy apps/workbench/test/unit/job_task_test.rb => services/api/test/unit/keep_service_test.rb (61%)
via ea17ec3d053bd2f792730c5ea74d03109ef942ce (commit)
via a46ebd3da9f41522abde23685bba92f538f76f03 (commit)
via c2e70e05178c9569e9de2ac5b3ef47440c49efc5 (commit)
via 1b3750c9ffbec7a76b374023188c5c13882dc651 (commit)
via 25bdeb97230abe28b9d5d7b13aa72549d93df87b (commit)
via 45216b83b108a3c48cdd8b1aaf898ccd93188507 (commit)
via 32eafceeb044696ac7db49bbe1d6329e0e3785c0 (commit)
via 64d339fa3eb693908ea107a10a4c376ba3b51d7b (commit)
via 1f43dd857829bd1134837c43a8ac5d653c0c68b1 (commit)
via 123ce64a39849224481a67cc400a04c5022b639f (commit)
via 52056c365c8936e34bc6b22a01bcacb556737914 (commit)
via 83277602806099428b859b88745ad85836cd6ee4 (commit)
via a2c261dada5b47077c7930a2133bb000631fab66 (commit)
via dffa580d39b977746f6950b835b78b949a862c9d (commit)
via 1924b28c8f715bc08752fb219d1fd8145ccfe84f (commit)
via 0bec8ec8a130cb3af013b6097cf322938fce5671 (commit)
via fa6b0b65fb71b66e36f982f4f25e9751672d0834 (commit)
via 661b2bcd6269fae643fd7d0c46649715716959eb (commit)
via f876a32276a73d89ab695e5954c9ea3816b38db9 (commit)
via 2dc7f15f81ea7f460114482614d8ec5814c36fbf (commit)
via 35cd1ab03e06910a2536bb473529511b8af20b94 (commit)
via 49d953403625ca145081f9ccd914e70d49e51d49 (commit)
via 040f1c94dfa1a53356d24e77afdbc0f2e5cfe91c (commit)
via ab710b74b2751f9a0d4eb5c5f950c6bb04865e79 (commit)
via 10bcbe8343f6f91f3c8e338a4a53766f7ba26ef1 (commit)
via 286c3627d978a7862b7f7eea366aa48ab930786d (commit)
via 2f27ee200f6cc4c97d30084e34330efef2068ebf (commit)
via 9c3beb526fe3bdfd6769abd0def5a1634074d353 (commit)
via ce2d2f5807822534756e52ac04bc272dd572d13d (commit)
via 50a277569ad6277d95b7e3be83ddefc7b92661f4 (commit)
via aad9cd74e61cff985944c400c40fe3f85907a1e7 (commit)
via efb58099eebde5bebb4cbfba9ce4ba70a142fc56 (commit)
via b12f667daa270a4e3c656d16f30620ca763f9578 (commit)
from b64b0a4082eeba5d17705dca3bedf53b99ded617 (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 ea17ec3d053bd2f792730c5ea74d03109ef942ce
Merge: a46ebd3 c2e70e0
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 18:43:28 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
Conflicts:
apps/workbench/app/views/layouts/application.html.erb
diff --cc apps/workbench/app/views/layouts/application.html.erb
index f009ffe,a5460c2..b55147f
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@@ -14,11 -14,7 +14,10 @@@
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<meta name="description" content="">
<meta name="author" content="">
-
+ <% if current_user %>
+ <meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>">
+ <% end %>
-
+ <meta name="robots" content="NOINDEX, NOFOLLOW">
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
commit a46ebd3da9f41522abde23685bba92f538f76f03
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 18:37:24 2014 -0400
2756: display log history for a running pipeline.
diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 4a95bac..ef936e3 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -54,7 +54,7 @@
$(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
parsedData = JSON.parse(eventData);
summary = parsedData.summary;
- $(this).append(summary + "<br/><br/>");
+ $(this).append(summary + "<br/>");
});
})();
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index e3a2b62..db2a467 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -22,6 +22,17 @@ module PipelineInstancesHelper
pj
end
+ def pipieline_log_history(job_uuids)
+ results = []
+
+ log_history = Log.where(event_type: 'transient-log-entry',
+ object_uuid: job_uuids).order('id DESC').limit(5).all
+ if !log_history.results.empty?
+ results = log_history.results.reverse
+ end
+
+ return results
+ end
protected
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index f0037bb..e6905cf 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -93,6 +93,10 @@ setInterval(function(){$('a.refresh').click()}, 15000);
<% if !@object.state.in? ['Complete', 'Failed'] %>
<% if !pipeline_job_uuids.empty? %>
<h4>Log for pipeline</h4>
+ <% log_history = pipieline_log_history(pipeline_job_uuids) %>
+ <% log_history.each do |entry| %>
+ <%=entry.summary%><br/>
+ <% end %>
<div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="<%=pipeline_job_uuids.join(" ")%>"/>
<% end %>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list