projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16267: Merge branch 'master' into 16267-change-arvbox-deps
[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..e5c71cb275ed19b21b5db637d49fe7e356b64aea 100644
(file)
--- a/
apps/workbench/app/controllers/jobs_controller.rb
+++ b/
apps/workbench/app/controllers/jobs_controller.rb
@@
-1,4
+1,12
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class JobsController < ApplicationController
class JobsController < ApplicationController
+ skip_around_action :require_thread_api_token, if: proc { |ctrl|
+ !Rails.configuration.Users.AnonymousUserToken.empty? and
+ 'show' == ctrl.action_name
+ }
def generate_provenance(jobs)
return if params['tab_pane'] != "Provenance"
def generate_provenance(jobs)
return if params['tab_pane'] != "Provenance"
@@
-16,11
+24,11
@@
class JobsController < ApplicationController
nodes[j[:script_version]] = {:uuid => j[:script_version]}
end
nodes[j[:script_version]] = {:uuid => j[:script_version]}
end
- Collection.where(uuid: collections).each do |c|
+ Collection.where(uuid: collections).
with_count("none").
each do |c|
nodes[c[:portable_data_hash]] = c
end
nodes[c[:portable_data_hash]] = c
end
- Collection.where(portable_data_hash: hashes).each do |c|
+ Collection.where(portable_data_hash: hashes).
with_count("none").
each do |c|
nodes[c[:portable_data_hash]] = c
end
nodes[c[:portable_data_hash]] = c
end
@@
-56,9
+64,12
@@
class JobsController < ApplicationController
super
end
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.Workbench.RunningJobLogRecordsToFetch).
+ map { |e| e.serializable_hash.merge({ 'prepend' => true }) }
+ respond_to do |format|
+ format.json { render json: @logs }
end
end
end
end