projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3021: Merge branch 'master' into 3021-leave-api-running
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
jobs
/
_show_log.html.erb
diff --git
a/apps/workbench/app/views/jobs/_show_log.html.erb
b/apps/workbench/app/views/jobs/_show_log.html.erb
index 2531f142b242a3246aff450ec2a08ee53c06f872..315c8c1831242faedef0c0a1a10b1991f88e06c7 100644
(file)
--- a/
apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/
apps/workbench/app/views/jobs/_show_log.html.erb
@@
-1,10
+1,19
@@
<% if !@object.log %>
<% if !@object.log %>
-<% log_history = stderr_log_history([@object.uuid]) %>
+<div id="log_graph_div"
+ class="arv-log-event-listener"
+ data-object-uuid="<%= @object.uuid %>"></div>
-<div class="arv-log-event-listener arv-log-event-handler-append-logs arv-job-log-window" id="pipeline_event_log_div" data-object-uuid="<%= @object.uuid %>"><%= log_history.join("\n") %>
-</div>
+<div id="event_log_div"
+ class="arv-log-event-listener arv-log-event-handler-append-logs arv-job-log-window"
+ data-object-uuid="<%= @object.uuid %>"
+ ></div>
+<%# Applying a long throttle suppresses the auto-refresh of this
+ partial that would normally be triggered by arv-log-event. %>
+<div class="arv-log-refresh-control"
+ data-load-throttle="86486400000" <%# 1001 nights %>
+ ></div>
<% else %>
<% else %>
@@
-49,7
+58,7
@@
var makeFilter = function() {
});
}
});
}
-<% if @object.log %>
+<% if @object.log
and !@object.log.empty?
%>
<% logcollection = Collection.find @object.log %>
<% if logcollection %>
log_size = <%= logcollection.files[0][2] %>
<% logcollection = Collection.find @object.log %>
<% if logcollection %>
log_size = <%= logcollection.files[0][2] %>