#814 when deleting device, avoid deleting jobs running on the device

This commit is contained in:
Oliver Gorwits
2021-10-04 19:35:42 +01:00
parent fd6a7ea5fb
commit a040e8ae38

View File

@@ -716,14 +716,14 @@ sub delete {
$ip, $gone, _plural($gone), $set ) ) if defined Dancer::Logger::logger();
}
foreach my $set (qw/
Admin
DeviceSkip
/) {
$schema->resultset($set)->search(
{ device => { '-in' => $devices->as_query } },
)->delete;
}
$schema->resultset('Admin')->search({
device => { '-in' => $devices->as_query },
status => { '-not_like' => 'queued-%' },
})->delete;
$schema->resultset('DeviceSkip')->search(
{ device => { '-in' => $devices->as_query } },
)->delete;
my $gone = $schema->resultset('Topology')->search({
-or => [