X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/09a2e88c51e5432e607f2a38466e55b4ba15e887..068e72307f9ce91538e45cb461b99cf92d2f5666:/apps/workbench/app/models/job.rb diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb index 7bfed6d44b..7c55d9e857 100644 --- a/apps/workbench/app/models/job.rb +++ b/apps/workbench/app/models/job.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class Job < ArvadosBase def self.goes_in_projects? true @@ -27,7 +31,7 @@ class Job < ArvadosBase 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 @@ -43,7 +47,7 @@ class Job < ArvadosBase end def stderr_log_query(limit=nil) - query = Log.where(object_uuid: self.uuid).order("created_at DESC") + query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none') query = query.limit(limit) if limit query end