diff --git a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm index 7ac1676e..12e8f1e3 100644 --- a/lib/App/Netdisco/Worker/Plugin/Arpnip.pm +++ b/lib/App/Netdisco/Worker/Plugin/Arpnip.pm @@ -16,10 +16,10 @@ register_worker({ phase => 'check' }, sub { return Status->error("arpnip skipped: $device not yet discovered") unless $device->in_storage; - return Status->defer("arpnip skipped: $device has no layer 3 capability") + return Status->info("arpnip skipped: $device has no layer 3 capability") unless $device->has_layer(3); - return Status->defer("arpnip deferred: $device is not arpnipable") + return Status->info("arpnip skipped: $device is not arpnipable") unless is_arpnipable_now($device); return Status->done('arpnip is able to run'); diff --git a/lib/App/Netdisco/Worker/Plugin/Discover.pm b/lib/App/Netdisco/Worker/Plugin/Discover.pm index 7c25daeb..d65d274e 100644 --- a/lib/App/Netdisco/Worker/Plugin/Discover.pm +++ b/lib/App/Netdisco/Worker/Plugin/Discover.pm @@ -16,7 +16,7 @@ register_worker({ phase => 'check' }, sub { return Status->error("discover failed: no device param (need -d ?)") if $device->ip eq '0.0.0.0'; - return Status->defer("discover skipped: $device is pseudo-device") + return Status->info("discover skipped: $device is pseudo-device") if $device->is_pseudo; # runner has already called get_device to promote $job->device @@ -24,7 +24,7 @@ register_worker({ phase => 'check' }, sub { if $device->in_storage and ($job->subaction eq 'with-nodes' and not $job->username); - return Status->defer("discover deferred: $device is not discoverable") + return Status->info("discover skipped: $device is not discoverable") unless is_discoverable_now($device); return Status->done('Discover is able to run.'); diff --git a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm index 163bf7e4..8f90fdf0 100644 --- a/lib/App/Netdisco/Worker/Plugin/Macsuck.pm +++ b/lib/App/Netdisco/Worker/Plugin/Macsuck.pm @@ -16,13 +16,13 @@ register_worker({ phase => 'check' }, sub { return Status->error("macsuck skipped: $device not yet discovered") unless $device->in_storage; - return Status->defer("macsuck skipped: $device is pseudo-device") + return Status->info("macsuck skipped: $device is pseudo-device") if $device->is_pseudo; - return Status->defer("macsuck skipped: $device has no layer 2 capability") + return Status->info("macsuck skipped: $device has no layer 2 capability") unless $device->has_layer(2); - return Status->defer("macsuck deferred: $device is not macsuckable") + return Status->info("macsuck skipped: $device is not macsuckable") unless is_macsuckable_now($device); return Status->done('Macsuck is able to run.'); diff --git a/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm b/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm index cff91e92..66734de8 100644 --- a/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm +++ b/lib/App/Netdisco/Worker/Plugin/Nbtstat.pm @@ -12,7 +12,7 @@ register_worker({ phase => 'check' }, sub { return Status->error('nbtstat failed: unable to interpret device param') unless defined $job->device; - return Status->defer(sprintf 'nbtstat deferred: %s is not macsuckable', $job->device->ip) + return Status->info(sprintf 'nbtstat skipped: %s is not macsuckable', $job->device->ip) unless is_macsuckable($job->device); return Status->done('Nbtstat is able to run.'); diff --git a/lib/App/Netdisco/Worker/Status.pm b/lib/App/Netdisco/Worker/Status.pm index eeae6570..6da8a458 100644 --- a/lib/App/Netdisco/Worker/Status.pm +++ b/lib/App/Netdisco/Worker/Status.pm @@ -97,8 +97,9 @@ A numeric constant for the status, to allow comparison. sub level { my $self = shift; return (($self->status eq 'done') ? 4 - : ($self->status eq 'info') ? 3 - : ($self->status eq 'defer') ? 2 : 1); + : ($self->status eq 'defer') ? 3 + : ($self->status eq 'info') ? 2 + : ($self->status eq 'error') ? 1 : 0); } 1;