projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
closes #11710
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
job.rb
diff --git
a/apps/workbench/app/models/job.rb
b/apps/workbench/app/models/job.rb
index 6566aeb7cd5f82c4aa9e8f16a88b4d287f1afc24..128440d52612c7b748eb91da7f14fba640045d0b 100644
(file)
--- a/
apps/workbench/app/models/job.rb
+++ b/
apps/workbench/app/models/job.rb
@@
-27,7
+27,7
@@
class Job < ArvadosBase
end
def cancel
end
def cancel
- arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
+ arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {
"cascade" => true
}
end
def self.queue_size
end
def self.queue_size
@@
-43,8
+43,7
@@
class Job < ArvadosBase
end
def stderr_log_query(limit=nil)
end
def stderr_log_query(limit=nil)
- query = Log.where(event_type: "stderr", object_uuid: self.uuid)
- .order("id DESC")
+ query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none')
query = query.limit(limit) if limit
query
end
query = query.limit(limit) if limit
query
end
@@
-53,4
+52,8
@@
class Job < ArvadosBase
stderr_log_query(limit).results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
stderr_log_query(limit).results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
+
+ def work_unit(label=nil)
+ JobWorkUnit.new(self, label, self.uuid)
+ end
end
end