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

do not run discover parts if properties failed to complete

Browse Source
This commit is contained in:
Oliver Gorwits
2017-10-07 13:21:13 +01:00
parent b52aaaf1a1
commit 58d0fbddda
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
View File

@@ -12,28 +12,26 @@ register_worker({ phase => 'main' }, sub {
# if requested, and the device has not yet been
# arpniped/macsucked, queue those jobs now
if ($device->in_storage
and $job->subaction and $job->subaction eq 'with-nodes') {
if (!defined $device->last_macsuck and $device->has_layer(2)) {
jq_insert({
device => $device->ip,
action => 'macsuck',
username => $job->username,
userip => $job->userip,
});
}
return unless $device->in_storage
and $job->subaction and $job->subaction eq 'with-nodes';
if (!defined $device->last_arpnip and $device->has_layer(3)) {
jq_insert({
device => $device->ip,
action => 'arpnip',
username => $job->username,
userip => $job->userip,
});
}
if (!defined $device->last_macsuck and $device->has_layer(2)) {
jq_insert({
device => $device->ip,
action => 'macsuck',
username => $job->username,
userip => $job->userip,
});
}
return true;
if (!defined $device->last_arpnip and $device->has_layer(3)) {
jq_insert({
device => $device->ip,
action => 'arpnip',
username => $job->username,
userip => $job->userip,
});
}
});
true;