Merge branch 'master' into 5145-combine-collections-repeated-filenames

[arvados.git] / apps / workbench / app / controllers / jobs_controller.rb

diff --git a/apps/workbench/app/controllers/jobs_controller.rb b/apps/workbench/app/controllers/jobs_controller.rb
index 31bbfa9615ca92904df9895a2ac47c98e0e1d57d..7edf8cc30d542a69489589b52b3c05d4abf0e270 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,4 +1,10 @@
 class JobsController < ApplicationController
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
+  }
+
+  include JobsHelper
 
   def generate_provenance(jobs)
     return if params['tab_pane'] != "Provenance"
@@ -56,9 +62,17 @@ class JobsController < ApplicationController
     super
   end
 
-  def push_logs
-    @push_logs = stderr_log_records([@object.uuid]).select do |log_record|
-      log_record.properties[:text] =~ /crunchstat: (mem.*swap.*rss|.*-- interval)/
+  def logs
+    @logs = Log.select(%w(event_type object_uuid event_at properties))
+               .order('event_at DESC')
+               .filter([["event_type",  "=", "stderr"],
+                        ["object_uuid", "in", [@object.uuid]]])
+               .limit(500)
+               .results
+               .to_a
+               .map{ |e| e.serializable_hash.merge({ 'prepend' => true }) }
+    respond_to do |format|
+      format.json { render json: @logs }
     end
   end