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

*able checks within jobs should not be necessary with skiplist

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-23 09:14:25 +01:00
parent e7c22e7d11
commit 44266f2767
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/App/Netdisco/Backend/Worker/Poller/Common.pm
View File

@@ -58,6 +58,7 @@ sub _single_body {
my $filter_method = $job_type .'_filter'; my $filter_method = $job_type .'_filter';
my $job_filter = $self->$filter_method; my $job_filter = $self->$filter_method;
# failsafe, should not be needed with skip checks
unless ($job_filter->($device->ip)) { unless ($job_filter->($device->ip)) {
return job_defer("$job_type deferred: $host is not ${job_type}able"); return job_defer("$job_type deferred: $host is not ${job_type}able");
} }

1
lib/App/Netdisco/Backend/Worker/Poller/Device.pm
View File

@@ -54,6 +54,7 @@ sub discover {
return job_done("discover skipped: $host is pseudo-device"); return job_done("discover skipped: $host is pseudo-device");
} }
# failsafe, should not be needed with skip checks
unless (is_discoverable_now($device->ip)) { unless (is_discoverable_now($device->ip)) {
return job_defer("discover deferred: $host is not discoverable"); return job_defer("discover deferred: $host is not discoverable");
} }

1
lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm
View File

@@ -29,6 +29,7 @@ sub nbtstat {
or job_error("nbtstat failed: unable to interpret device parameter"); or job_error("nbtstat failed: unable to interpret device parameter");
my $host = $device->ip; my $host = $device->ip;
# failsafe, should not be needed with skip checks
unless (is_macsuckable($device->ip)) { unless (is_macsuckable($device->ip)) {
return job_defer("nbtstat deferred: $host is not macsuckable"); return job_defer("nbtstat deferred: $host is not macsuckable");
} }