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

be less strict about finding the IP for logging

Browse Source
This commit is contained in:
Oliver Gorwits
2019-01-03 23:29:14 +00:00
parent b3f6ffe0d7
commit 23a87f19fd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -608,8 +608,7 @@ sub delete {
try { $ip ||= $devices->{attrs}->{where}->{ip} }; try { $ip ||= $devices->{attrs}->{where}->{ip} };
try { $ip ||= $devices->{attrs}->{where}->{'me.ip'} }; try { $ip ||= $devices->{attrs}->{where}->{'me.ip'} };
} }
die "cannot find IP address in \$devices query for delete\n" $ip ||= 'netdisco';
unless $ip;
foreach my $set (qw/ foreach my $set (qw/
DeviceIp DeviceIp

3
lib/App/Netdisco/DB/ResultSet/DevicePort.pm
View File

@@ -239,8 +239,7 @@ sub delete {
try { $ip ||= ${ $ports->{attrs}->{where}->{ip}->{'-in'} }->[1]->[1] }; try { $ip ||= ${ $ports->{attrs}->{where}->{ip}->{'-in'} }->[1]->[1] };
try { $ip ||= $ports->{attrs}->{where}->{'me.ip'} }; try { $ip ||= $ports->{attrs}->{where}->{'me.ip'} };
} }
die "cannot find IP address in \$ports query for delete\n" $ip ||= 'netdisco';
unless $ip;
foreach my $set (qw/ foreach my $set (qw/
DevicePortPower DevicePortPower