Commit 95f7a7af authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

Merge branch 'version/2.1' into version/2.2

* version/2.1:
  cause_of_death can be undefined here (for local meadows, for instance)
parents c49c292b 695cf3b6
...@@ -468,7 +468,7 @@ sub release_undone_jobs_from_role { ...@@ -468,7 +468,7 @@ sub release_undone_jobs_from_role {
} ); } );
$sth->execute(); $sth->execute();
my $cod = $worker->cause_of_death(); my $cod = $worker->cause_of_death() || 'UNKNOWN';
$msg ||= "GarbageCollector: The worker died because of $cod"; $msg ||= "GarbageCollector: The worker died because of $cod";
my $resource_overusage = ($cod eq 'MEMLIMIT') || ($cod eq 'RUNLIMIT' and $worker->work_done()==0); my $resource_overusage = ($cod eq 'MEMLIMIT') || ($cod eq 'RUNLIMIT' and $worker->work_done()==0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment