cancel jobs when it is known fresh device is already discovered

2018-02-11 11:16:14 +00:00
parent 147c02a956
commit d3c83c395d
4 changed files with 34 additions and 7 deletions
--- a/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
@@ -13,8 +13,7 @@ register_worker({ phase => 'main' }, sub {

  # if requested, and the device has not yet been
  # arpniped/macsucked, queue those jobs now
-  return unless $device->in_storage
-    and $job->subaction and $job->subaction eq 'with-nodes';
+  return unless $device->in_storage and $job->subaction eq 'with-nodes';

  if (!defined $device->last_macsuck and $device->has_layer(2)) {
    jq_insert({