From 0cbce4ab3f0972059da4adcb48bc1ab5753d2cc6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 3 Sep 2021 21:32:48 +0100 Subject: [PATCH] Swap error and info return status from Jobs to avoid info() on error --- Changes | 1 + lib/App/Netdisco/Backend/Job.pm | 2 +- lib/App/Netdisco/Worker/Status.pm | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 17b9416b..b69662bb 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ [BUG FIXES] * Allow port_control_reasons setting to actually work + * Swap error and info return status from Jobs to avoid info() on error 2.049003 - 2021-09-03 diff --git a/lib/App/Netdisco/Backend/Job.pm b/lib/App/Netdisco/Backend/Job.pm index 15ff7e0c..a3f142ae 100644 --- a/lib/App/Netdisco/Backend/Job.pm +++ b/lib/App/Netdisco/Backend/Job.pm @@ -122,7 +122,7 @@ sub finalise_status { $job->status('error'); $job->log('failed to report from any worker!'); - my $max_level = Status->error()->level; + my $max_level = Status->info()->level; if ($job->is_cancelled and scalar @{ $job->_statuslist }) { $job->status( $job->_statuslist->[-1]->status ); diff --git a/lib/App/Netdisco/Worker/Status.pm b/lib/App/Netdisco/Worker/Status.pm index 6da8a458..82ecfa72 100644 --- a/lib/App/Netdisco/Worker/Status.pm +++ b/lib/App/Netdisco/Worker/Status.pm @@ -98,8 +98,8 @@ sub level { my $self = shift; return (($self->status eq 'done') ? 4 : ($self->status eq 'defer') ? 3 - : ($self->status eq 'info') ? 2 - : ($self->status eq 'error') ? 1 : 0); + : ($self->status eq 'error') ? 2 + : ($self->status eq 'info') ? 1 : 0); } 1;