135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct algorithm on finalise status, correct logging

Browse Source
This commit is contained in:
Oliver Gorwits
2017-11-11 14:43:53 +00:00
parent 98442a2308
commit c5f138fe62
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/App/Netdisco/Backend/Job.pm
View File

@@ -55,8 +55,9 @@ sub summary {
Find the best status and log it into the job's C<status> and C<log> slots. Find the best status and log it into the job's C<status> and C<log> slots.
The process is to track back from the last worker, ignoring user workers, and The process is to track back from the last worker and find the best status,
find the best status (out of done, defer, error) within the last phase run. which is C<done> in early or main phases, or else any status in any non-user
phase.
=cut =cut
@@ -68,15 +69,14 @@ sub finalise_status {
$job->status('error'); $job->status('error');
$job->log('failed to report from any worker!'); $job->log('failed to report from any worker!');
my $phase = undef;
my $max_level = Status->error()->level; my $max_level = Status->error()->level;
foreach my $status (reverse @{ $job->_statuslist }) { foreach my $status (reverse @{ $job->_statuslist }) {
next unless $status->phase next unless $status->phase
and $status->phase =~ m/^(?:check|early|main)$/; and $status->phase =~ m/^(?:check|early|main)$/;
$phase ||= $status->phase; next if $status->phase eq 'check'
last if $status->phase ne $phase; and $status->level eq Status->done()->level;
if ($status->level > $max_level) { if ($status->level > $max_level) {
$job->status( $status->status ); $job->status( $status->status );
@@ -156,7 +156,9 @@ sub add_status {
return unless ref $status eq 'App::Netdisco::Worker::Status'; return unless ref $status eq 'App::Netdisco::Worker::Status';
$status->phase( $job->_current_phase ); $status->phase( $job->_current_phase );
push @{ $job->_statuslist }, $status; push @{ $job->_statuslist }, $status;
debug $status->log if $status->log; debug $status->log if $status->log
and (($status->phase eq 'check')
or ($status->level ne Status->done()->level));
} }
=head1 ADDITIONAL COLUMNS =head1 ADDITIONAL COLUMNS