X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c72375f74e8a251e9f09c8a16dbed9174417292..f91bae113a348bb049f6391043f8ba9529def694:/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 831d71777b..b523af81ae 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,3 +1,14 @@
+<% 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>
+
+<% else %>
+
 <script>
 (function() {
 var pagesize = 1000;
@@ -15,7 +26,7 @@ var taskState = newTaskState();
 
 var makeFilter = function() {
   var pass = [];
-  $(".toggle-filter").each(function(i, e) {
+  $(".toggle-filter, .radio-filter").each(function(i, e) {
     if (e.checked) {
       pass.push(e.id.substr(5));
     }
@@ -43,22 +54,22 @@ var makeFilter = function() {
   <% logcollection = Collection.find @object.log %>
   <% if logcollection %>
     $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
-    done(function(data, status, jqxhr) {
-    logViewer.filter();
-    addToLogViewer(logViewer, data.split("\n"), taskState);
-    logViewer.filter(makeFilter());
-    generateJobOverview("#log-viewer-overview", logViewer, taskState);
-    $("#logloadspinner").detach();
-    }).
-    fail(function(jqxhr, status, error) {
-    $("#logloadspinner").detach();
-    });
+	done(function(data, status, jqxhr) {
+	    logViewer.filter();
+	    addToLogViewer(logViewer, data.split("\n"), taskState);
+	    logViewer.filter(makeFilter());
+	    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. %>
 <% end %>
 
-$(".toggle-filter").on("change", function() {
+$(".toggle-filter, .radio-filter").on("change", function() {
   logViewer.filter(makeFilter());
 });
 
@@ -69,7 +80,6 @@ $("#filter-all").on("click", function() {
 
 $("#filter-none").on("click", function() {
   $(".toggle-filter").each(function(i, f) { f.checked = false; console.log(f); });
-  $("#show-all-tasks").prop("checked", true);
   logViewer.filter(makeFilter());
 });
 
@@ -90,7 +100,7 @@ $("#set-show-failed-only").on("click", function() {
   $("#show-failed-tasks").prop("checked", true);
   $("#show-crunch").prop("checked", false);
   $("#show-task-dispatch").prop("checked", true);
-  $("#show-task-output").prop("checked", true);
+  $("#show-script-print").prop("checked", true);
   $("#show-crunchstat").prop("checked", false);
   logViewer.filter(makeFilter());
   logViewer.sort("taskid", {sortFunction: sortByTask});
@@ -104,16 +114,8 @@ $("#set-show-failed-only").on("click", function() {
 
   <h3>Summary</h3>
   <p id="log-viewer-overview">
-    <% if !@object.log %>
-      <% if @object.finished_at %>
-        This job did not produce an output log.
-      <% else %>
-        This job is still running.  The job log will be available when the job is complete.
-      <% end %>
-    <% else %>
-      <% if !logcollection %>
-        The collection containing the job log was not found.
-      <% end %>
+    <% if !logcollection %>
+      The collection containing the job log was not found.
     <% end %>
   </p>
 
@@ -122,7 +124,7 @@ $("#set-show-failed-only").on("click", function() {
     <span class="pull-right">
       <% if @object.andand.tasks_summary.andand[:failed] and @object.tasks_summary[:failed] > 0 %>
         <button id="set-show-failed-only" class="btn btn-danger">
-          Show failed task output only
+          Show failed task diagnostics only
         </button>
       <% end %>
 
@@ -152,25 +154,25 @@ $("#set-show-failed-only").on("click", function() {
 
   <div>
     <div class="radio-inline log-viewer-button" style="margin-left: 10px">
-      <label><input id="show-all-tasks" type="radio" name="show-tasks-group" checked="true" class="toggle-filter"> Show all tasks</label>
+      <label><input id="show-all-tasks" type="radio" name="show-tasks-group" checked="true" class="radio-filter"> Show all tasks</label>
     </div>
     <div class="radio-inline log-viewer-button">
-      <label><input id="show-successful-tasks" type="radio" name="show-tasks-group" class="toggle-filter"> Only successful tasks</label>
+      <label><input id="show-successful-tasks" type="radio" name="show-tasks-group" class="radio-filter"> Only successful tasks</label>
     </div>
     <div class="radio-inline log-viewer-button">
-      <label><input id="show-failed-tasks" type="radio" name="show-tasks-group" class="toggle-filter"> Only failed tasks</label>
+      <label><input id="show-failed-tasks" type="radio" name="show-tasks-group" class="radio-filter"> Only failed tasks</label>
     </div>
   </div>
 
   <div>
     <div class="checkbox-inline log-viewer-button" style="margin-left: 10px">
-      <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch output</label>
+      <label><input id="show-crunch" type="checkbox" checked="true" class="toggle-filter"> Show crunch diagnostics</label>
     </div>
     <div class="checkbox-inline log-viewer-button">
       <label><input id="show-task-dispatch" type="checkbox" checked="true" class="toggle-filter"> Show task dispatch</label>
     </div>
     <div class="checkbox-inline log-viewer-button">
-      <label><input id="show-task-output" type="checkbox" checked="true" class="toggle-filter"> Show task output</label>
+      <label><input id="show-task-print" type="checkbox" checked="true" class="toggle-filter"> Show task diagnostics</label>
     </div>
     <div class="checkbox-inline log-viewer-button">
       <label><input id="show-crunchstat" type="checkbox" checked="true" class="toggle-filter"> Show compute usage</label>
@@ -205,7 +207,7 @@ $("#set-show-failed-only").on("click", function() {
     </table>
 
     <% if @object.log and logcollection %>
-      <%= image_tag 'ajax-loader.gif', id: "logloadspinner" %>
+      <div class="spinner spinner-32px"></div>
     <% end %>
 
   </div>
@@ -216,3 +218,5 @@ $("#set-show-failed-only").on("click", function() {
     <a href="#" class="log-viewer-page-down"><span class='glyphicon glyphicon-arrow-down'></span></a>
   </div>
 </div>
+
+<% end %>