split device properties and alias discovery and allow cancel after properties

2018-02-11 12:31:16 +00:00
parent b213d0b9af
commit e31cb803eb
2 changed files with 49 additions and 18 deletions
--- a/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
+++ b/lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
@@ -69,7 +69,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {

  return if $new_ip eq $old_ip;

-  return schema('netdisco')->txn_do(sub {
+  schema('netdisco')->txn_do(sub {
    my $existing = schema('netdisco')->resultset('Device')->search({
      ip => $new_ip, vendor => $device->vendor, serial => $device->serial,
    });