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

#479 part 2, use debug logging instead of info (#480)

Browse Source 
#479 part 2, use debug instead of info logging.

2 whitespace cleanups also included, as well as rewording props -> properties like in the rest of portproperties.pm
This commit is contained in:
nick n
2019-01-08 01:50:21 +01:00
committed by GitHub
parent 1b2592321d
commit 98a5e2c407
8 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -155,7 +155,7 @@ sub store_neighbors {
my $portrow = $device_ports->{$port}; my $portrow = $device_ports->{$port};
if (!defined $portrow) { if (!defined $portrow) {
info sprintf ' [%s] neigh - local port %s not in database!', debug sprintf ' [%s] neigh - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -167,7 +167,7 @@ sub store_neighbors {
} }
if ($portrow->manual_topo) { if ($portrow->manual_topo) {
info sprintf ' [%s] neigh - %s has manually defined topology', debug sprintf ' [%s] neigh - %s has manually defined topology',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -181,7 +181,7 @@ sub store_neighbors {
my $r_netaddr = NetAddr::IP::Lite->new($remote_ip); my $r_netaddr = NetAddr::IP::Lite->new($remote_ip);
if ($r_netaddr and ($r_netaddr->addr ne $remote_ip)) { if ($r_netaddr and ($r_netaddr->addr ne $remote_ip)) {
info sprintf ' [%s] neigh - IP on %s: using %s as canonical form of %s', debug sprintf ' [%s] neigh - IP on %s: using %s as canonical form of %s',
$device->ip, $port, $r_netaddr->addr, $remote_ip; $device->ip, $port, $r_netaddr->addr, $remote_ip;
$remote_ip = $r_netaddr->addr; $remote_ip = $r_netaddr->addr;
} }
@@ -195,7 +195,7 @@ sub store_neighbors {
if ($remote_id) { if ($remote_id) {
my $devices = schema('netdisco')->resultset('Device'); my $devices = schema('netdisco')->resultset('Device');
my $neigh = $devices->single({name => $remote_id}); my $neigh = $devices->single({name => $remote_id});
info sprintf debug sprintf
' [%s] neigh - bad address %s on port %s, searching for %s instead', ' [%s] neigh - bad address %s on port %s, searching for %s instead',
$device->ip, $remote_ip, $port, $remote_id; $device->ip, $remote_ip, $port, $remote_id;
@@ -213,7 +213,7 @@ sub store_neighbors {
(my $tmpid = $remote_id) =~ s/.*\(([0-9a-f]{6})-([0-9a-f]{6})\).*/$1$2/; (my $tmpid = $remote_id) =~ s/.*\(([0-9a-f]{6})-([0-9a-f]{6})\).*/$1$2/;
my $mac = NetAddr::MAC->new(mac => $tmpid); my $mac = NetAddr::MAC->new(mac => $tmpid);
if ($mac and not $mac->errstr) { if ($mac and not $mac->errstr) {
info sprintf debug sprintf
' [%s] neigh - trying to find neighbor %s by MAC %s', ' [%s] neigh - trying to find neighbor %s by MAC %s',
$device->ip, $remote_id, $mac->as_ieee; $device->ip, $remote_id, $mac->as_ieee;
$neigh = $devices->single({mac => $mac->as_ieee}); $neigh = $devices->single({mac => $mac->as_ieee});
@@ -227,17 +227,17 @@ sub store_neighbors {
if ($neigh) { if ($neigh) {
$remote_ip = $neigh->ip; $remote_ip = $neigh->ip;
info sprintf ' [%s] neigh - found %s with IP %s', debug sprintf ' [%s] neigh - found %s with IP %s',
$device->ip, $remote_id, $remote_ip; $device->ip, $remote_id, $remote_ip;
} }
else { else {
info sprintf ' [%s] neigh - could not find %s, skipping', debug sprintf ' [%s] neigh - could not find %s, skipping',
$device->ip, $remote_id; $device->ip, $remote_id;
next; next;
} }
} }
else { else {
info sprintf ' [%s] neigh - skipping unuseable address %s on port %s', debug sprintf ' [%s] neigh - skipping unuseable address %s on port %s',
$device->ip, $remote_ip, $port; $device->ip, $remote_ip, $port;
next; next;
} }
@@ -254,7 +254,7 @@ sub store_neighbors {
$remote_port =~ s/[^\d\s\/\.,()\w:-]+//gi; $remote_port =~ s/[^\d\s\/\.,()\w:-]+//gi;
} }
else { else {
info sprintf ' [%s] neigh - no remote port found for port %s at %s', debug sprintf ' [%s] neigh - no remote port found for port %s at %s',
$device->ip, $port, $remote_ip; $device->ip, $port, $remote_ip;
} }

2
lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
View File

@@ -50,7 +50,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $port = $interfaces->{ $p_ifindex->{$entry} } or next; my $port = $interfaces->{ $p_ifindex->{$entry} } or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] power - local port %s not in database!', debug sprintf ' [%s] power - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }

12
lib/App/Netdisco/Worker/Plugin/Discover/PortProperties.pm
View File

@@ -30,7 +30,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
foreach my $idx (keys %$raw_speed) { foreach my $idx (keys %$raw_speed) {
my $port = $interfaces->{$idx} or next; my $port = $interfaces->{$idx} or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] properties/speed - local port %s not in database!', debug sprintf ' [%s] properties/speed - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -43,7 +43,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
foreach my $idx (keys %$err_cause) { foreach my $idx (keys %$err_cause) {
my $port = $interfaces->{$idx} or next; my $port = $interfaces->{$idx} or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] properties/errdis - local port %s not in database!', debug sprintf ' [%s] properties/errdis - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -56,7 +56,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
foreach my $idx (keys %$faststart) { foreach my $idx (keys %$faststart) {
my $port = $interfaces->{$idx} or next; my $port = $interfaces->{$idx} or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] properties/faststart - local port %s not in database!', debug sprintf ' [%s] properties/faststart - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -77,7 +77,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
foreach my $idx (keys %$c_if) { foreach my $idx (keys %$c_if) {
my $port = $interfaces->{ $c_if->{$idx} } or next; my $port = $interfaces->{ $c_if->{$idx} } or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] properties/lldpcap - local port %s not in database!', debug sprintf ' [%s] properties/lldpcap - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -106,12 +106,12 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
my $gone = $device->properties_ports->delete; my $gone = $device->properties_ports->delete;
debug sprintf ' [%s] props - removed %d ports with properties', debug sprintf ' [%s] properties - removed %d ports with properties',
$device->ip, $gone; $device->ip, $gone;
$device->properties_ports->populate( $device->properties_ports->populate(
[map {{ port => $_, %{ $properties{$_} } }} keys %properties] ); [map {{ port => $_, %{ $properties{$_} } }} keys %properties] );
return Status->info(sprintf ' [%s] props - added %d new port properties', return Status->info(sprintf ' [%s] properties - added %d new port properties',
$device->ip, scalar keys %properties); $device->ip, scalar keys %properties);
}); });
}); });

4
lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
View File

@@ -151,7 +151,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
if (defined $snmp->snmpEngineTime) { if (defined $snmp->snmpEngineTime) {
$dev_uptime_wrapped = int( $snmp->snmpEngineTime * 100 / 2**32 ); $dev_uptime_wrapped = int( $snmp->snmpEngineTime * 100 / 2**32 );
if ($dev_uptime_wrapped > 0) { if ($dev_uptime_wrapped > 0) {
info sprintf ' [%s] interface - device uptime wrapped %d times - correcting', debug sprintf ' [%s] interfaces - device uptime wrapped %d times - correcting',
$device->ip, $dev_uptime_wrapped; $device->ip, $dev_uptime_wrapped;
$device->uptime( $dev_uptime + $dev_uptime_wrapped * 2**32 ); $device->uptime( $dev_uptime + $dev_uptime_wrapped * 2**32 );
} }
@@ -190,7 +190,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
my $lc = $i_lastchange->{$entry} || 0; my $lc = $i_lastchange->{$entry} || 0;
if (not $dev_uptime_wrapped and $lc > $dev_uptime) { if (not $dev_uptime_wrapped and $lc > $dev_uptime) {
info sprintf ' [%s] interfaces - device uptime wrapped (%s) - correcting', debug sprintf ' [%s] interfaces - device uptime wrapped (%s) - correcting',
$device->ip, $port; $device->ip, $port;
$device->uptime( $dev_uptime + 2**32 ); $device->uptime( $dev_uptime + 2**32 );
$dev_uptime_wrapped = 1; $dev_uptime_wrapped = 1;

2
lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
View File

@@ -49,7 +49,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $port = $interfaces->{$entry} or next; my $port = $interfaces->{$entry} or next;
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] vlans - local port %s not in database!', debug sprintf ' [%s] vlans - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }

4
lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
View File

@@ -41,7 +41,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
} }
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] wireless - local port %s not in database!', debug sprintf ' [%s] wireless - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }
@@ -75,7 +75,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
} }
if (!defined $device_ports->{$port}) { if (!defined $device_ports->{$port}) {
info sprintf ' [%s] wireless - local port %s not in database!', debug sprintf ' [%s] wireless - local port %s already skipped, ignoring',
$device->ip, $port; $device->ip, $port;
next; next;
} }

1
lib/App/Netdisco/Worker/Plugin/Macsuck/Nodes.pm
View File

@@ -248,7 +248,6 @@ sub get_vlan_list {
# check in use by a port on this device # check in use by a port on this device
if (!$vlans{$vlan} && !setting('macsuck_all_vlans')) { if (!$vlans{$vlan} && !setting('macsuck_all_vlans')) {
debug sprintf debug sprintf
' [%s] macsuck VLAN %s/%s - not in use by any port - skipping.', ' [%s] macsuck VLAN %s/%s - not in use by any port - skipping.',
$device->ip, $vlan, $name; $device->ip, $vlan, $name;

1
lib/App/Netdisco/Worker/Plugin/Nbtstat/Core.pm
View File

@@ -47,4 +47,3 @@ register_worker({ phase => 'main' }, sub {
}); });
true; true;