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

Merge branch 'master' into og-multiple-domain-suffix

Browse Source
This commit is contained in:
Oliver Gorwits
2019-09-03 13:00:39 +01:00
parent 9a752e0298 14ac69dc2e
commit 1dcafc08a8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Worker/Plugin/Macwalk.pm
View File

@@ -11,9 +11,8 @@ register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('macsuck'); my %queued = map {$_ => 1} jq_queued('macsuck');
my @devices = schema('netdisco')->resultset('Device')->search({ my @devices = schema('netdisco')->resultset('Device')
-or => [ 'vendor' => undef, 'vendor' => { '!=' => 'netdisco' }], ->has_layer('2')->get_column('ip')->all;
})->has_layer('2')->get_column('ip')->all;
my @filtered_devices = grep {!exists $queued{$_}} @devices; my @filtered_devices = grep {!exists $queued{$_}} @devices;
jq_insert([ jq_insert([

5
lib/App/Netdisco/Worker/Plugin/Nbtwalk.pm
View File

@@ -11,9 +11,8 @@ register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my %queued = map {$_ => 1} jq_queued('nbtstat'); my %queued = map {$_ => 1} jq_queued('nbtstat');
my @devices = schema('netdisco')->resultset('Device')->search({ my @devices = schema('netdisco')->resultset('Device')
-or => [ 'vendor' => undef, 'vendor' => { '!=' => 'netdisco' }], ->has_layer('2')->get_column('ip')->all;
})->has_layer('2')->get_column('ip')->all;
my @filtered_devices = grep {!exists $queued{$_}} @devices; my @filtered_devices = grep {!exists $queued{$_}} @devices;
jq_insert([ jq_insert([