use overloaded $device

This commit is contained in:
Oliver Gorwits
2017-09-13 10:53:12 +01:00
parent d5d39289d6
commit 753acc607f
14 changed files with 17 additions and 17 deletions

View File

@@ -41,7 +41,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
$device->ip, scalar @$v6; $device->ip, scalar @$v6;
$device->update({last_arpnip => \$now}); $device->update({last_arpnip => \$now});
return Status->done('Ended arpnip for '. $device->ip); return Status->done("Ended arpnip for $device");
}); });
# get an arp table (v4 or v6) # get an arp table (v4 or v6)

View File

@@ -30,7 +30,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
debug sprintf ' [%s] arpnip - processed %s Subnet entries', debug sprintf ' [%s] arpnip - processed %s Subnet entries',
$device->ip, scalar @subnets; $device->ip, scalar @subnets;
return Status->done('Ended arpnip for '. $device->ip); return Status->done("Ended arpnip for $device");
}); });
# gathers device subnets # gathers device subnets

View File

@@ -13,7 +13,7 @@ register_worker({ stage => 'check' }, sub {
$port = ($port ? 1 : 0); $port = ($port ? 1 : 0);
delete_device($device, $port, $extra); delete_device($device, $port, $extra);
return Status->done(sprintf "Deleted device %s.", $device->ip); return Status->done("Deleted device: $device");
}); });
true; true;

View File

@@ -59,7 +59,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
} # ALIAS } # ALIAS
} }
return Status->done('Ended discover for '. $device->ip) return Status->done("Ended discover for $device")
if $new_ip eq $old_ip; if $new_ip eq $old_ip;
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
@@ -76,7 +76,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
$old_ip, $device->ip, ($device->dns || ''); $old_ip, $device->ip, ($device->dns || '');
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -90,7 +90,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
$device->ip, scalar @modules; $device->ip, scalar @modules;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -145,7 +145,7 @@ register_worker({ stage => 'first', driver => 'snmp' }, sub {
$device->ip, scalar values %interfaces; $device->ip, scalar values %interfaces;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -61,7 +61,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
}); });
} }
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
=head2 store_neighbors( $device, $snmp ) =head2 store_neighbors( $device, $snmp )

View File

@@ -76,7 +76,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
$device->ip, scalar @portpower; $device->ip, scalar @portpower;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -99,7 +99,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
$device->ip, scalar @aliases; $device->ip, scalar @aliases;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -89,7 +89,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
$device->ip, scalar @portvlans; $device->ip, scalar @portvlans;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -80,7 +80,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
$device->ip, scalar @channels; $device->ip, scalar @channels;
}); });
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -33,7 +33,7 @@ register_worker({ stage => 'second' }, sub {
} }
} }
return Status->done('Ended discover for '. $device->ip); return Status->done("Ended discover for $device");
}); });
true; true;

View File

@@ -94,7 +94,7 @@ register_worker({ stage => 'check', driver => 'snmp' }, sub {
$device->ip, $archived; $device->ip, $archived;
$device->update({last_macsuck => \$now}); $device->update({last_macsuck => \$now});
return Status->done('Ended macsuck for '. $device->ip); return Status->done("Ended macsuck for $device");
}); });
=head2 store_node( $ip, $vlan, $port, $mac, $now? ) =head2 store_node( $ip, $vlan, $port, $mac, $now? )

View File

@@ -21,7 +21,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
my $now = 'to_timestamp('. (join '.', gettimeofday) .')'; my $now = 'to_timestamp('. (join '.', gettimeofday) .')';
my $cd11_txrate = $snmp->cd11_txrate; my $cd11_txrate = $snmp->cd11_txrate;
return Status->done('Ended macsuck for '. $device->ip) return Status->done("Ended macsuck for $device")
unless $cd11_txrate and scalar keys %$cd11_txrate; unless $cd11_txrate and scalar keys %$cd11_txrate;
if (setting('store_wireless_clients')) { if (setting('store_wireless_clients')) {
@@ -31,7 +31,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
else { else {
debug sprintf ' [%s] macsuck - dot11 info available but skipped due to config', debug sprintf ' [%s] macsuck - dot11 info available but skipped due to config',
$device->ip; $device->ip;
return Status->done('Ended macsuck for '. $device->ip); return Status->done("Ended macsuck for $device");
} }
my $cd11_rateset = $snmp->cd11_rateset(); my $cd11_rateset = $snmp->cd11_rateset();
@@ -83,7 +83,7 @@ register_worker({ stage => 'second', driver => 'snmp' }, sub {
}); });
} }
return Status->done('Ended macsuck for '. $device->ip); return Status->done("Ended macsuck for $device");
}); });
true; true;