X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/80649ee8eb1138e7a44ebb750ae62c675b193000..8ee2f83955b1b71571aa428335340f505c3c2264:/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 11a4e99edb..c39b7c4317 100644 --- a/apps/workbench/app/controllers/jobs_controller.rb +++ b/apps/workbench/app/controllers/jobs_controller.rb @@ -1,5 +1,8 @@ class JobsController < ApplicationController - include JobsHelper + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + 'show' == ctrl.action_name + } def generate_provenance(jobs) return if params['tab_pane'] != "Provenance" @@ -27,6 +30,7 @@ class JobsController < ApplicationController @svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", { :request => request, + :direction => :top_down, :all_script_parameters => true, :script_version_nodes => true} end @@ -57,9 +61,12 @@ 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 = @object. + stderr_log_query(Rails.configuration.running_job_log_records_to_fetch). + map { |e| e.serializable_hash.merge({ 'prepend' => true }) } + respond_to do |format| + format.json { render json: @logs } end end