diff --git a/lib/App/Netdisco/Backend/Worker/Poller/Common.pm b/lib/App/Netdisco/Backend/Worker/Poller/Common.pm index be75566d..96e66f94 100644 --- a/lib/App/Netdisco/Backend/Worker/Poller/Common.pm +++ b/lib/App/Netdisco/Backend/Worker/Poller/Common.pm @@ -58,7 +58,6 @@ sub _single_body { my $filter_method = $job_type .'_filter'; my $job_filter = $self->$filter_method; - # failsafe, should not be needed with skip checks unless ($job_filter->($device->ip)) { return job_defer("$job_type deferred: $host is not ${job_type}able"); } diff --git a/lib/App/Netdisco/Backend/Worker/Poller/Device.pm b/lib/App/Netdisco/Backend/Worker/Poller/Device.pm index d8595450..097733d3 100644 --- a/lib/App/Netdisco/Backend/Worker/Poller/Device.pm +++ b/lib/App/Netdisco/Backend/Worker/Poller/Device.pm @@ -54,7 +54,6 @@ sub discover { return job_done("discover skipped: $host is pseudo-device"); } - # failsafe, should not be needed with skip checks unless (is_discoverable_now($device)) { return job_defer("discover deferred: $host is not discoverable"); } diff --git a/lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm b/lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm index 330cf02d..72c7c9ef 100644 --- a/lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm +++ b/lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm @@ -29,7 +29,6 @@ sub nbtstat { or job_error("nbtstat failed: unable to interpret device parameter"); my $host = $device->ip; - # failsafe, should not be needed with skip checks unless (is_macsuckable($device)) { return job_defer("nbtstat deferred: $host is not macsuckable"); } diff --git a/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/lib/App/Netdisco/JobQueue/PostgreSQL.pm index 8e29fc36..f56462c4 100644 --- a/lib/App/Netdisco/JobQueue/PostgreSQL.pm +++ b/lib/App/Netdisco/JobQueue/PostgreSQL.pm @@ -145,8 +145,6 @@ sub jq_lock { # and the skiplist was primed. these should be checked against # the various acls and have device_skip entry added if needed, # and return false if it should have been skipped. - # this is also why it's probably unnecessary to check is_* within - # jobs, but we do that as well, just to be sure. my @badactions = _get_denied_actions($job->device); if (scalar @badactions) { schema('netdisco')->resultset('DeviceSkip')->find_or_create({