2883: Live updating log wip

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 35c2bafa4575cafa5a7470c2be078b6b1d3e6481..a3e73fa13683794b36bd08ad468af589f1d59fb2 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -63,6 +63,7 @@ var makeFilter = function() {
   });
 }
 
+<% if @object.log %>
 <% logcollection = Collection.find @object.log %>
 
 $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
@@ -72,6 +73,19 @@ $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
     logViewer.filter(makeFilter());
     $("#logloadspinner").detach();
   });
+<% else %>
+  <% backlog = ""
+     Log.filter([['object_uuid', '=', @object.uuid],
+                  ['event_type', '=', 'stderr']]).order(["id", "asc"]).each do |l|
+        backlog += l.properties["text"]
+     end
+   %>
+  var backlog = "<%=j backlog %>";
+    logViewer.filter();
+    addToLogViewer(logViewer, backlog.split("\n"));
+    logViewer.filter(makeFilter());
+
+<% end %>
 
 $(".toggle-filter").on("change", function() {
   logViewer.filter(makeFilter());

diff --git a/services/api/app/models/log.rb b/services/api/app/models/log.rb
index 6921eca9a4ab3e6db20c4b5ec9f6da603e602514..34e6dfa354ca93a742ca4913b89d40d7accab147 100644 (file)
--- a/services/api/app/models/log.rb
+++ b/services/api/app/models/log.rb
@@ -7,6 +7,7 @@ class Log < ArvadosModel
   attr_accessor :object, :object_kind
 
   api_accessible :user, extend: :common do |t|
+    t.add :id
     t.add :object_uuid
     t.add :object_owner_uuid
     t.add :object_kind