X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/edc5e4b6645b9b983a85a892bf3d3ad1432a657d..a11c56ef66604a9117e3db8c2fa2273c98f88b51:/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 01d2167ffc..315c8c1831 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,11 +1,19 @@
 <% if !@object.log %>
 
-<% log_history = stderr_log_history([@object.uuid]) %>
-<div class="arv-log-event-listener arv-log-event-handler-append-logs arv-job-log-window" id="pipeline_event_log_div" data-object-uuids="<%= @object.uuid %>">
-  <% log_history.each do |entry| %>
-    <%=entry%><br/>
-  <% end %>
-</div>
+<div id="log_graph_div"
+     class="arv-log-event-listener"
+     data-object-uuid="<%= @object.uuid %>"></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 %>
 
@@ -50,41 +58,41 @@ 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] %>
     log_maxbytes = <%= Rails.configuration.log_viewer_max_bytes %>;
     logcollection_url = '<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>';
     $("#log-viewer-download-url").attr('href', logcollection_url);
-    $("#log-viewer-download-pane").css('display', 'inline');
+    $("#log-viewer-download-pane").show();
     if (log_size > log_maxbytes) {
       range_header = { 'Range': 'bytes=0-' + log_maxbytes };
     } else {
       range_header = null;
     }
     $.ajax(logcollection_url, { headers: range_header }).
-	done(function(data, status, jqxhr) {
-	    logViewer.filter();
-	    addToLogViewer(logViewer, data.split("\n"), taskState);
-	    logViewer.filter(makeFilter());
+        done(function(data, status, jqxhr) {
+            logViewer.filter();
+            addToLogViewer(logViewer, data.split("\n"), taskState);
+            logViewer.filter(makeFilter());
             content_range_hdr = jqxhr.getResponseHeader('Content-Range');
-	    var v = content_range_hdr && content_range_hdr.match(/bytes \d+-(\d+)\/(.+)/);
+            var v = content_range_hdr && content_range_hdr.match(/bytes \d+-(\d+)\/(.+)/);
             short_log = v && (v[2] == '*' || parseInt(v[1]) + 1 < v[2]);
-	    if (jqxhr.status == 206 && short_log) {
-	      $("#log-viewer-overview").html(
-		'<p>Showing only ' + data.length + ' bytes of this log.' +
-		' Timing information is unavailable since' +
-		' the full log was not retrieved.</p>'
-	      );
+            if (jqxhr.status == 206 && short_log) {
+              $("#log-viewer-overview").html(
+                '<p>Showing only ' + data.length + ' bytes of this log.' +
+                ' Timing information is unavailable since' +
+                ' the full log was not retrieved.</p>'
+              );
             } else {
-	      generateJobOverview("#log-viewer-overview", logViewer, taskState);
-	    }
-	    $("#log-viewer .spinner").detach();
-	}).
-	fail(function(jqxhr, status, error) {
-	    $("#log-viewer .spinner").detach();
-	});
+              generateJobOverview("#log-viewer-overview", logViewer, taskState);
+            }
+            $("#log-viewer .spinner").detach();
+        }).
+        fail(function(jqxhr, status, error) {
+            $("#log-viewer .spinner").detach();
+        });
   <% end %>
 <% else %>
   <%# Live log loading not implemented yet. %>