projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9767: add a link to workflow in the container_request#show page.
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
container_work_unit.rb
diff --git
a/apps/workbench/app/models/container_work_unit.rb
b/apps/workbench/app/models/container_work_unit.rb
index f9159231a09f4d7ad197464e1a1403a8e8a3d0ef..e56c0655234cb598aecaf917abb3c3cca59f3156 100644
(file)
--- a/
apps/workbench/app/models/container_work_unit.rb
+++ b/
apps/workbench/app/models/container_work_unit.rb
@@
-124,9
+124,13
@@
class ContainerWorkUnit < ProxyWorkUnit
get_combined(:output_path)
end
get_combined(:output_path)
end
+ def log_object_uuids
+ [get_combined(:uuid), get(:uuid)].uniq
+ end
+
def live_log_lines(limit=2000)
event_types = ["stdout", "stderr", "arv-mount", "crunch-run"]
def live_log_lines(limit=2000)
event_types = ["stdout", "stderr", "arv-mount", "crunch-run"]
- log_lines = Log.where(event_type: event_types, object_uuid:
uuid
).order("id DESC").limit(limit)
+ log_lines = Log.where(event_type: event_types, object_uuid:
log_object_uuids
).order("id DESC").limit(limit)
log_lines.results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
log_lines.results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
@@
-138,6
+142,13
@@
class ContainerWorkUnit < ProxyWorkUnit
end
end
end
end
+ def template_uuid
+ properties = get(:properties)
+ if properties
+ properties[:template_uuid]
+ end
+ end
+
# End combined propeties
protected
# End combined propeties
protected