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

include message with renumber die

Browse Source
This commit is contained in:
Oliver Gorwits
2015-04-27 16:38:58 +01:00
parent 55acc3533f
commit 39174c7e39
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -82,7 +82,8 @@ sub set_canonical_ip {
} }
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
$device->renumber($new_ip) or die; # rollback $device->renumber($new_ip)
or die "cannot renumber to: $new_ip"; # rollback
my $hostname = hostname_from_ip($device->ip); my $hostname = hostname_from_ip($device->ip);
$device->update({dns => $hostname}); $device->update({dns => $hostname});

3
Netdisco/lib/App/Netdisco/Util/Device.pm
View File

@@ -117,7 +117,8 @@ sub renumber_device {
my $happy = 0; my $happy = 0;
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
$device->renumber($new_ip) or die; # rollback $device->renumber($new_ip)
or die "cannot renumber to: $new_ip"; # rollback
schema('netdisco')->resultset('UserLog')->create({ schema('netdisco')->resultset('UserLog')->create({
username => session('logged_in_user'), username => session('logged_in_user'),